Skip to content

Conversation

@DK101010
Copy link
Contributor

Description

This PR...

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

manually testet

@DK101010 DK101010 changed the title Bug/unmanaged ingest exceptions Bug/unmanaged ingest exceptions #4539 Dec 14, 2020
@rohityadavcloud rohityadavcloud added this to the 4.15.1.0 milestone Dec 14, 2020
@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2491

Copy link
Contributor

@shwstppr shwstppr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on code changes.

@DaanHoogland
Copy link
Contributor

@DK101010 can you explain why #1 is on the commits listr for this PR?

@DK101010
Copy link
Contributor Author

@DaanHoogland I had updated my fork with the apache/cloudstack master over the GitHub Web interface. For this I had to created a pull request in my fork.... mmmh is that wrong ?

@DaanHoogland
Copy link
Contributor

@DaanHoogland I had updated my fork with the apache/cloudstack master over the GitHub Web interface. For this I had to created a pull request in my fork.... mmmh is that wrong ?

It is a red flag to me, but i think we'll squash and merge this anyway, so it won't polute our master branch in the end. don't worry.

@DK101010
Copy link
Contributor Author

@DaanHoogland I had updated my fork with the apache/cloudstack master over the GitHub Web interface. For this I had to created a pull request in my fork.... mmmh is that wrong ?

It is a red flag to me, but i think we'll squash and merge this anyway, so it won't polute our master branch in the end. don't worry.

@DaanHoogland Hmmm ... but how would be looks like right? Not quite sure what should I change in the future.

@DaanHoogland
Copy link
Contributor

@DaanHoogland I had updated my fork with the apache/cloudstack master over the GitHub Web interface. For this I had to created a pull request in my fork.... mmmh is that wrong ?

It is a red flag to me, but i think we'll squash and merge this anyway, so it won't polute our master branch in the end. don't worry.

@DaanHoogland Hmmm ... but how would be looks like right? Not quite sure what should I change in the future.

I think, you would need to branch of master and then base your code on that, or cherry-pick it on it.
$ git checkout master
$ git pull
$ git checkout -b
$ git cherry-pick

or

$ git checkout master
$ git pull
$ git checkout
$ git rebase -i master

not sure what happened with you but it looks like you merged an ancient commit. I doubt if that would have done anything for you.

@DK101010
Copy link
Contributor Author

@DaanHoogland I had updated my fork with the apache/cloudstack master over the GitHub Web interface. For this I had to created a pull request in my fork.... mmmh is that wrong ?

It is a red flag to me, but i think we'll squash and merge this anyway, so it won't polute our master branch in the end. don't worry.

@DaanHoogland Hmmm ... but how would be looks like right? Not quite sure what should I change in the future.

I think, you would need to branch of master and then base your code on that, or cherry-pick it on it.
$ git checkout master
$ git pull
$ git checkout -b
$ git cherry-pick

or

$ git checkout master
$ git pull
$ git checkout
$ git rebase -i master

not sure what happened with you but it looks like you merged an ancient commit. I doubt if that would have done anything for you.

Could it be that you work with the apache/cloudstack master without forking?

@DaanHoogland
Copy link
Contributor

not sure what happened with you but it looks like you merged an ancient commit. I doubt if that would have done anything for you.

Could it be that you work with the apache/cloudstack master without forking?

I work with several forks. I have my private that I rarely use and only in free time. my company one, some clients and some conculeagues/friends. 12 in total. mine was forked originaly, but on whatever i work, I start with pulling master from the origin and than proceed with git checkout -b <branchname>. it always does the trick.

@DK101010
Copy link
Contributor Author

not sure what happened with you but it looks like you merged an ancient commit. I doubt if that would have done anything for you.

Could it be that you work with the apache/cloudstack master without forking?

I work with several forks. I have my private that I rarely use and only in free time. my company one, some clients and some conculeagues/friends. 12 in total. mine was forked originaly, but on whatever i work, I start with pulling master from the origin and than proceed with git checkout -b <branchname>. it always does the trick.

I think I understood. your git remote address pointed to apache/cloudstack and your upstream to your fork correct?

@DaanHoogland
Copy link
Contributor

not sure what happened with you but it looks like you merged an ancient commit. I doubt if that would have done anything for you.

Could it be that you work with the apache/cloudstack master without forking?

I work with several forks. I have my private that I rarely use and only in free time. my company one, some clients and some conculeagues/friends. 12 in total. mine was forked originaly, but on whatever i work, I start with pulling master from the origin and than proceed with git checkout -b <branchname>. it always does the trick.

I think I understood. your git remote address pointed to apache/cloudstack and your upstream to your fork correct?

Well, i think you do but in my words:
for master the upstream alias is origin and points to apache/cloudstack and
for the branch i work in i let the remote be for instance my personal fork.

Copy link
Contributor

@davidjumani davidjumani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM

@rohityadavcloud
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

Trillian test result (tid-3353)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33730 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4540-t3353-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Smoke tests completed. 85 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_04_rvpc_privategw_static_routes Failure 237.26 test_privategw_acl.py

@rohityadavcloud rohityadavcloud modified the milestones: 4.15.1.0, 4.15.0.0 Dec 21, 2020
@rohityadavcloud rohityadavcloud merged commit 874c7be into apache:master Dec 21, 2020
qrry added a commit to qrry/cloudstack that referenced this pull request Dec 23, 2020
* master:
  server: add conditions for custom offerings (apache#4540)
  vr: Ensuring dnsmasq.leases file is populated (apache#4529)
  template: Ensuring template is cross zone if type changed to system (apache#4522)
  storage: Fix hypervisor type cast to string (apache#4516)
  db upgrade: fix sql exception: Access denied; you need (at least one of) the SUPER privilege(s) for this operation (apache#4533)
  CLOUDSTACK-10423:Potential sensitive information disclosure (apache#4536)
  jobs: The patch remove the password from resultObject and make it be humanreadable (apache#4538)
  listphysicalnetworks: Honouring keyword parameter (apache#4511)
  Fix NPE when Volume exists on secondary store but doesn't have a download URL (apache#4530)
  apidoc issue (apache#4532)
  db: Fix description of volume.stats.interval which is in milliseconds not seconds (apache#4526)
  kvm: set cpu topology only if cpucore per socket is positive value (apache#4527)
  xenserver: check and eject patch vbd for systemvms (apache#4525)
  Fix warning when setup cloudstack-common (apache#4523)
  kvm: FIX cpucorespersocket is not working on KVM (apache#4497)
  change debug to warn for unknown exceptions (apache#4521)
  Fix failure in validating IP address in case of multiple Management Servers (apache#4507)
  Update log output for FirstFitPlanner (apache#4515)
  ui: deprecate old UI and move to legacy to be served at /client/legacy (apache#4518)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants