You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2021/11/02 15:28:37 UTC

[GitHub] [cloudstack] DaanHoogland opened a new pull request #5658: remove VmWorkJob after adding a nic to a vm

DaanHoogland opened a new pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658


   ### Description
   
   This PR...
   <!--- Describe your changes in DETAIL - And how has behaviour functionally changed. -->
   
   <!-- For new features, provide link to FS, dev ML discussion etc. -->
   <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
   
   <!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
   <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
   Fixes: #5651
   
   <!--- ********************************************************************************* -->
   <!--- NOTE: AUTOMATATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
   <!--- PLEASE PUT AN 'X' in only **ONE** box -->
   <!--- ********************************************************************************* -->
   
   ### Types of changes
   
   - [ ] Breaking change (fix or feature that would cause existing functionality to change)
   - [ ] New feature (non-breaking change which adds functionality)
   - [x] 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
   - [x] Minor
   
   #### Bug Severity
   
   - [x] BLOCKER
   - [ ] Critical
   - [ ] Major
   - [ ] Minor
   - [ ] Trivial
   
   
   ### Screenshots (if appropriate):
   
   
   ### How Has This Been Tested?
   <!-- Please describe in detail how you tested your changes. -->
   <!-- Include details of your testing environment, and the tests you ran to -->
   <!-- see how your change affects other areas of the code, etc. -->
   
   
   <!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958689901


   @blueorangutan test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957964675






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959578467


   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez closed pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez closed pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957866615


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-961347883


   <b>Trillian test result (tid-2541)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 29920 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2541-kvm-centos7.zip
   Smoke tests completed. 90 look OK, 1 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_native_to_native_vpc_migration | `Error` | 32.45 | test_migration.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r778060406



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -5631,35 +5640,72 @@ private void checkConcurrentJobsPerDatastoreThreshhold(final StoragePool destPoo
 
         final List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vm.getId(),
-                VmWorkAddVmToNetwork.class.getName());
+                VmWorkAddVmToNetwork.class.getName(), network.getUuid());
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            assert pendingWorkJobs.size() == 1;
+            if (pendingWorkJobs.size() > 1) {
+                s_logger.warn(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
+            }
             workJob = pendingWorkJobs.get(0);
         } else {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace(String.format("no jobs to add network %s for vm %s yet", network, vm));
+            }
 
-            workJob = new VmWorkJobVO(context.getContextId());
+            workJob = createVmWorkJobToAddNetwork(vm, network, requested, context, user, account);
+        }
+        AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(workJob.getId());
 
-            workJob.setDispatcher(VmWorkConstants.VM_WORK_JOB_DISPATCHER);
-            workJob.setCmd(VmWorkAddVmToNetwork.class.getName());
+        if (s_logger.isTraceEnabled()) {
+            s_logger.trace(String.format("job %s to add network %s for vm %s processed", workJob.toString(), network, vm));
+        }
+        if (workJob.getStep() == VmWorkJobVO.Step.Done ||
+            workJob.getStep() == VmWorkJobVO.Step.Error ||
+            workJob.getStep() == VmWorkJobVO.Step.Release) {
+            _workJobDao.expunge(workJob.getId());
+        }

Review comment:
       @DaanHoogland 
   I suggest you to try to reproduce the issue #5499 without last commit.
   
   ps: I  found that some vm work jobs are in `Filed` step even if job is finished.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r777888980



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -5631,35 +5640,72 @@ private void checkConcurrentJobsPerDatastoreThreshhold(final StoragePool destPoo
 
         final List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vm.getId(),
-                VmWorkAddVmToNetwork.class.getName());
+                VmWorkAddVmToNetwork.class.getName(), network.getUuid());
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            assert pendingWorkJobs.size() == 1;
+            if (pendingWorkJobs.size() > 1) {
+                s_logger.warn(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
+            }
             workJob = pendingWorkJobs.get(0);
         } else {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace(String.format("no jobs to add network %s for vm %s yet", network, vm));
+            }
 
-            workJob = new VmWorkJobVO(context.getContextId());
+            workJob = createVmWorkJobToAddNetwork(vm, network, requested, context, user, account);
+        }
+        AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(workJob.getId());
 
-            workJob.setDispatcher(VmWorkConstants.VM_WORK_JOB_DISPATCHER);
-            workJob.setCmd(VmWorkAddVmToNetwork.class.getName());
+        if (s_logger.isTraceEnabled()) {
+            s_logger.trace(String.format("job %s to add network %s for vm %s processed", workJob.toString(), network, vm));
+        }
+        if (workJob.getStep() == VmWorkJobVO.Step.Done ||
+            workJob.getStep() == VmWorkJobVO.Step.Error ||
+            workJob.getStep() == VmWorkJobVO.Step.Release) {
+            _workJobDao.expunge(workJob.getId());
+        }

Review comment:
       @DaanHoogland 
   this PR lists pending work jobs by vm id and also network uuid.
   If you add multiple networks to a vm, cloudstack will create work jobs for all of them, and process the jobs.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007301218


   @sureshanaparti @weizhouapache I finally weeded out the final crinch here, a job was joined twice leading to an SQL exception. It did work but I'll start another test round for both parallel adding and re-adding of a network.
   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r777562716



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -5631,35 +5640,72 @@ private void checkConcurrentJobsPerDatastoreThreshhold(final StoragePool destPoo
 
         final List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vm.getId(),
-                VmWorkAddVmToNetwork.class.getName());
+                VmWorkAddVmToNetwork.class.getName(), network.getUuid());
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            assert pendingWorkJobs.size() == 1;
+            if (pendingWorkJobs.size() > 1) {
+                s_logger.warn(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
+            }
             workJob = pendingWorkJobs.get(0);
         } else {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace(String.format("no jobs to add network %s for vm %s yet", network, vm));
+            }
 
-            workJob = new VmWorkJobVO(context.getContextId());
+            workJob = createVmWorkJobToAddNetwork(vm, network, requested, context, user, account);
+        }
+        AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(workJob.getId());
 
-            workJob.setDispatcher(VmWorkConstants.VM_WORK_JOB_DISPATCHER);
-            workJob.setCmd(VmWorkAddVmToNetwork.class.getName());
+        if (s_logger.isTraceEnabled()) {
+            s_logger.trace(String.format("job %s to add network %s for vm %s processed", workJob.toString(), network, vm));
+        }
+        if (workJob.getStep() == VmWorkJobVO.Step.Done ||
+            workJob.getStep() == VmWorkJobVO.Step.Error ||
+            workJob.getStep() == VmWorkJobVO.Step.Release) {
+            _workJobDao.expunge(workJob.getId());
+        }

Review comment:
       @DaanHoogland 
   the last commit seems to be not needed.

##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -5631,35 +5640,72 @@ private void checkConcurrentJobsPerDatastoreThreshhold(final StoragePool destPoo
 
         final List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vm.getId(),
-                VmWorkAddVmToNetwork.class.getName());
+                VmWorkAddVmToNetwork.class.getName(), network.getUuid());
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            assert pendingWorkJobs.size() == 1;
+            if (pendingWorkJobs.size() > 1) {
+                s_logger.warn(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));

Review comment:
       ```suggestion
                   throw new CloudRuntimeException(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
   ```

##########
File path: engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql
##########
@@ -17,4 +17,7 @@
 
 --;
 -- Schema upgrade from 4.16.0.0 to 4.16.1.0
---;
\ No newline at end of file
+--;
+
+ALTER TABLE `cloud`.`vm_work_job` ADD COLUMN `secondary_object` char(100) COMMENT 'any additional item that must be checked during queueing' AFTER `vm_instance_id`;
+ALTER TABLE `cloud`.`vm_work_job` ADD CONSTRAINT `vm_work_job_step_and_objects` UNIQUE KEY (`step`,`vm_instance_id`,`secondary_object`);

Review comment:
       ```suggestion
   ```




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003390774


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957974754






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007810369


   <b>Trillian test result (tid-2829)</b>
   Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 34882 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2829-vmware-65u2.zip
   Smoke tests completed. 92 look OK, 0 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005656900


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2092


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland merged pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland merged pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000123920






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673827


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960448098


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1673


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001986129


   Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2031


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959570867


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960473952


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007333317


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2129


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005698572


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957963799


   @blueorangutan package
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959564260


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673502


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959449776


   <b>Trillian test result (tid-2525)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 29955 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2525-kvm-centos7.zip
   Smoke tests completed. 90 look OK, 1 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_native_to_native_vpc_migration | `Error` | 32.72 | test_migration.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959575870






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958689968


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959564260






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741621686



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       Should there be a default return if none of the cases are matched? 




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673827






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000070796


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000065248


   Packaging result: :heavy_multiplication_x: el7 :heavy_check_mark: el8 :heavy_multiplication_x: debian :heavy_check_mark: suse15. SL-JID 1994


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-999655333


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1002038769


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2033


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000070460


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003467165


   <b>Trillian test result (tid-2762)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31962 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2762-kvm-centos7.zip
   Smoke tests completed. 88 look OK, 3 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_vpc_privategw_static_routes | `Failure` | 229.19 | test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 236.33 | test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 362.64 | test_privategw_acl.py
   test_02_native_to_native_vpc_migration | `Error` | 37.18 | test_migration.py
   test_01_nic | `Error` | 174.09 | test_nic.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007392439


   > fully works for adding in parallel and re-adding. I did notice however that deleting in parallel sometimes doesn't work. We will need to revisit the general area of this functionality again in the future @blueorangutan test matrix
   
   great ! @DaanHoogland 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007393939


   @weizhouapache a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rohityadavcloud edited a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rohityadavcloud edited a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007877506


   Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007829664


   <b>Trillian test result (tid-2827)</b>
   Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 37773 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2827-xenserver-71.zip
   Smoke tests completed. 92 look OK, 0 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1004597104


   @sureshanaparti no


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673827


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959574889


   <b>Trillian Build Failed (tid-2529)<b/>


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001986129


   Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2031


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000091233






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rohityadavcloud removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rohityadavcloud removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960473512






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960430543






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1002067268


   @blueorangutan test keepEnv


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1002732804


   <b>Trillian test result (tid-2748)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 108361 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2748-kvm-centos7.zip
   Smoke tests completed. 60 look OK, 31 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestRVPCSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
   ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup | `Error` | 0.00 | test_vpc_vpn.py
   ContextSuite context=TestVpcRemoteAccessVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
   ContextSuite context=TestVpcSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
   ContextSuite context=TestRemoteDiagnostics>:setup | `Error` | 0.00 | test_diagnostics.py
   ContextSuite context=TestLoadBalance>:setup | `Error` | 0.00 | test_loadbalance.py
   ContextSuite context=TestVPCRedundancy>:setup | `Error` | 0.00 | test_vpc_redundant.py
   ContextSuite context=TestPrivateGwACL>:setup | `Error` | 0.00 | test_privategw_acl.py
   ContextSuite context=TestDeployVirtioSCSIVM>:setup | `Error` | 0.00 | test_deploy_virtio_scsi_vm.py
   ContextSuite context=TestIsolatedNetworksPasswdServer>:setup | `Error` | 0.00 | test_password_server.py
   ContextSuite context=TestDeployVMFromISO>:setup | `Error` | 0.00 | test_deploy_vm_iso.py
   ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   ContextSuite context=TestDeployVmWithUserData>:setup | `Error` | 0.00 | test_deploy_vm_with_userdata.py
   ContextSuite context=TestDeployVmWithVariedPlanners>:setup | `Error` | 0.00 | test_deploy_vms_with_varied_deploymentplanners.py
   ContextSuite context=TestRAMCPUResourceAccounting>:setup | `Error` | 0.00 | test_resource_accounting.py
   ContextSuite context=TestPortForwardingRules>:setup | `Error` | 0.00 | test_portforwardingrules.py
   ContextSuite context=TestDomainsServiceOfferings>:setup | `Error` | 1515.56 | test_domain_service_offerings.py
   ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py
   test_01_template_usage | `Error` | 11.44 | test_usage.py
   test_01_volume_usage | `Error` | 187.40 | test_usage.py
   test_list_clusters_metrics | `Error` | 1512.27 | test_metrics_api.py
   test_list_vms_metrics | `Error` | 0.18 | test_metrics_api.py
   ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
   ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
   ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
   ContextSuite context=TestIsolatedNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
   ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
   test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 0.01 | test_kubernetes_clusters.py
   test_02_upgrade_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_04_autoscale_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_05_basic_lifecycle_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_06_delete_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_07_deploy_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_08_upgrade_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_09_delete_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_02_native_to_native_vpc_migration | `Error` | 30.70 | test_migration.py
   test_01_add_delete_kubernetes_supported_version | `Error` | 1802.58 | test_kubernetes_supported_versions.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.14 | test_service_offerings.py
   ContextSuite context=TestListIdsParams>:setup | `Error` | 0.00 | test_list_ids_parameter.py
   test_delete_account | `Error` | 1512.29 | test_network.py
   test_delete_network_while_vm_on_it | `Error` | 1.15 | test_network.py
   test_deploy_vm_l2network | `Error` | 1.14 | test_network.py
   test_l2network_restart | `Error` | 2.21 | test_network.py
   ContextSuite context=TestPortForwarding>:setup | `Error` | 3.40 | test_network.py
   ContextSuite context=TestPublicIP>:setup | `Error` | 1.14 | test_network.py
   test_reboot_router | `Failure` | 0.05 | test_network.py
   test_releaseIP | `Error` | 0.45 | test_network.py
   ContextSuite context=TestRouterRules>:setup | `Error` | 0.50 | test_network.py
   ContextSuite context=TestNetworkACL>:setup | `Error` | 0.00 | test_network_acl.py
   test_01_nic | `Error` | 178.35 | test_nic.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
   ContextSuite context=TestAdapterTypeForNic>:setup | `Error` | 0.00 | test_nic_adapter_type.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000065248


   Packaging result: :heavy_multiplication_x: el7 :heavy_check_mark: el8 :heavy_multiplication_x: debian :heavy_check_mark: suse15. SL-JID 1994


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1002972779


   ran one of the failing tests and it passed, now re-running the entire suite.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1004003009


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2070


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007805304


   <b>Trillian test result (tid-2824)</b>
   Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 34903 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2824-xenserver-71.zip
   Smoke tests completed. 91 look OK, 1 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_sys_vm_start | `Failure` | 0.12 | test_secondary_storage.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007385650


   fully works for adding in parallel and re-adding. I did notice however that deleting in parallel sometimes doesn't work. We will need to revisit the general area of this functionality again in the future
   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007301700


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959554728






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959564260






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-972637882


   Ping any update/news on this @DaanHoogland cc @sureshanaparti @weizhouapache 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-999692842






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-999692842


   Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 1992


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957964675






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959554728


   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959570867


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958655666


   PR doesn't seem ready cc @DaanHoogland @weizhouapache @nvazquez @sureshanaparti 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673827






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-961040941


   note that travis job 14 is showing regressions. we can't merge this.
   it assumes cone in #5541 which should be reverted to get 4.16 out.
   cc @div8cn 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005616605


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1006152542






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007817572


   <b>Trillian test result (tid-2826)</b>
   Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 36578 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2826-vmware-65u2.zip
   Smoke tests completed. 92 look OK, 0 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958689764


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1668


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1004650277


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2085


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r778844448



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -5631,35 +5640,72 @@ private void checkConcurrentJobsPerDatastoreThreshhold(final StoragePool destPoo
 
         final List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vm.getId(),
-                VmWorkAddVmToNetwork.class.getName());
+                VmWorkAddVmToNetwork.class.getName(), network.getUuid());
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            assert pendingWorkJobs.size() == 1;
+            if (pendingWorkJobs.size() > 1) {
+                s_logger.warn(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
+            }
             workJob = pendingWorkJobs.get(0);
         } else {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace(String.format("no jobs to add network %s for vm %s yet", network, vm));
+            }
 
-            workJob = new VmWorkJobVO(context.getContextId());
+            workJob = createVmWorkJobToAddNetwork(vm, network, requested, context, user, account);
+        }
+        AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(workJob.getId());
 
-            workJob.setDispatcher(VmWorkConstants.VM_WORK_JOB_DISPATCHER);
-            workJob.setCmd(VmWorkAddVmToNetwork.class.getName());
+        if (s_logger.isTraceEnabled()) {
+            s_logger.trace(String.format("job %s to add network %s for vm %s processed", workJob.toString(), network, vm));
+        }
+        if (workJob.getStep() == VmWorkJobVO.Step.Done ||
+            workJob.getStep() == VmWorkJobVO.Step.Error ||
+            workJob.getStep() == VmWorkJobVO.Step.Release) {
+            _workJobDao.expunge(workJob.getId());
+        }

Review comment:
       yes @weizhouapache I noticed that too.
   The scenario from #5499 doen't work, only two nics get added to the VM. I'll keep looking




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1004650277


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2085


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958655666






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960473512


   @blueorangutan test 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673502






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673827






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-999655333


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1002068984


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001936552


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000123920


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000032692


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000122686


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-999657448


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005697603






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-961347883


   <b>Trillian test result (tid-2541)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 29920 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2541-kvm-centos7.zip
   Smoke tests completed. 90 look OK, 1 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_native_to_native_vpc_migration | `Error` | 32.45 | test_migration.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959557517


   @weizhouapache a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959554728


   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957825980






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957825980






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003390652


   @blueorangutan test keepEnv


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003467165


   <b>Trillian test result (tid-2762)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31962 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2762-kvm-centos7.zip
   Smoke tests completed. 88 look OK, 3 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_vpc_privategw_static_routes | `Failure` | 229.19 | test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 236.33 | test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 362.64 | test_privategw_acl.py
   test_02_native_to_native_vpc_migration | `Error` | 37.18 | test_migration.py
   test_01_nic | `Error` | 174.09 | test_nic.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000070460


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000091233


   Packaging result: :heavy_check_mark: el7 :heavy_multiplication_x: el8 :heavy_check_mark: debian :heavy_multiplication_x: suse15. SL-JID 1996


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-997616058


   @DaanHoogland can you fix the conflicts. thanks.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958689968


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959554728


   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rohityadavcloud removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rohityadavcloud removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957963799


   @blueorangutan package
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001935311


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1008678452


   > Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?
   
   @rohityadavcloud @DaanHoogland 
   I have tested it, #5651 is not back. it is good.
   I was not able to reproduce #5499, so I am not sure if it is fixed.
   code lgtm.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1004558696


   Hi @DaanHoogland is this PR ready?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007301218






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005677149


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 2093


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007386021


   @DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rohityadavcloud commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rohityadavcloud commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007877506


   Is this ready for merging, or needs testing @DaanHoogland @weizhouapache ?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000160644


   Packaging result: :heavy_check_mark: el7 :heavy_multiplication_x: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1997


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000032692


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000033253


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000033253


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959570867






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673502






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-961180021


   <b>Trillian test result (tid-2539)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 35511 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2539-kvm-centos7.zip
   Smoke tests completed. 90 look OK, 1 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_native_to_native_vpc_migration | `Error` | 30.71 | test_migration.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741621686



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       Should there be a default return if none of the cases are matched? 




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673502






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959564260






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741621686



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       Should there be a default return if none of the cases are matched? 




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959564260


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957825980


   still needs testing @weizhouapache m but can you review?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-961347883


   <b>Trillian test result (tid-2541)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 29920 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2541-kvm-centos7.zip
   Smoke tests completed. 90 look OK, 1 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_native_to_native_vpc_migration | `Error` | 32.45 | test_migration.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958689901


   @blueorangutan test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958673502


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959578467


   @blueorangutan test matrix


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957866615


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959557517






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007767133


   <b>Trillian test result (tid-2825)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 30933 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2825-kvm-centos7.zip
   Smoke tests completed. 92 look OK, 0 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1006152542






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005697603


   @blueorangutan test
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005615680


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003390774


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001999648






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003970023


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001935311


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-972662217


   No @rhtyd , this will need addressing. The original fix caused a regression.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960430543


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958689764


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1668


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957964675


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741621686



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       Should there be a default return if none of the cases are matched? 




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960448098


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1673


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-958655666


   PR doesn't seem ready cc @DaanHoogland @weizhouapache @nvazquez @sureshanaparti 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959570867


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959564260


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1002732804






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005656900






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005697603


   @blueorangutan test
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1006152542


   <b>Trillian test result (tid-2789)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 32681 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2789-kvm-centos7.zip
   Smoke tests completed. 89 look OK, 3 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_vpc_privategw_static_routes | `Failure` | 225.22 | test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 232.23 | test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 344.70 | test_privategw_acl.py
   test_02_native_to_native_vpc_migration | `Error` | 38.99 | test_migration.py
   test_01_nic | `Error` | 175.39 | test_nic.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rohityadavcloud edited a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rohityadavcloud edited a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007877506


   Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] sureshanaparti removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
sureshanaparti removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1000122686


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001999648


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001999176


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001999176


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741740943



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       there should actually be a throw. let me check




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741740943



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       there should actually be a throw. let me check




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957974754


   Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 1663


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957963799


   @blueorangutan package
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741740943



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       there should actually be a throw. let me check




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r741740943



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4026,25 +4027,39 @@ public NicProfile addVmToNetwork(final VirtualMachine vm, final Network network,
 
             final Object jobException = _jobMgr.unmarshallResultObject(outcome.getJob());
             if (jobException != null) {
-                if (jobException instanceof ResourceUnavailableException) {
-                    throw (ResourceUnavailableException)jobException;
-                } else if (jobException instanceof ConcurrentOperationException) {
-                    throw (ConcurrentOperationException)jobException;
-                } else if (jobException instanceof InsufficientCapacityException) {
-                    throw (InsufficientCapacityException)jobException;
-                } else if (jobException instanceof RuntimeException) {
-                    throw (RuntimeException)jobException;
-                } else if (jobException instanceof Throwable) {
-                    throw new RuntimeException("Unexpected exception", (Throwable)jobException);
-                } else if (jobException instanceof NicProfile) {
-                    return (NicProfile)jobException;
-                }
+                return getNewNicProfile(vm, network, requested, outcome, jobException);
             }
 
             throw new RuntimeException("Unexpected job execution result");
         }
     }
 
+    @NotNull
+    private NicProfile getNewNicProfile(VirtualMachine vm, Network network, NicProfile requested, Outcome<VirtualMachine> outcome, Object jobException) throws ResourceUnavailableException, InsufficientCapacityException {
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("remove vmworkjob record %d for adding nic %s to net %s in vm %s",
+                    outcome.getJob().getId(),
+                    requested.getUuid(),
+                    network.getUuid(),
+                    vm.getUuid()));// remove vmworkjob record
+        }
+        _workJobDao.expunge(outcome.getJob().getId());
+
+        if (jobException instanceof ResourceUnavailableException) {
+            throw (ResourceUnavailableException) jobException;
+        } else if (jobException instanceof ConcurrentOperationException) {
+            throw (ConcurrentOperationException) jobException;
+        } else if (jobException instanceof InsufficientCapacityException) {
+            throw (InsufficientCapacityException) jobException;
+        } else if (jobException instanceof RuntimeException) {
+            throw (RuntimeException) jobException;
+        } else if (jobException instanceof Throwable) {
+            throw new RuntimeException("Unexpected exception", (Throwable) jobException);
+        } else if (jobException instanceof NicProfile) {
+            return (NicProfile) jobException;
+        }

Review comment:
       there should actually be a throw. let me check




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-957963799


   @blueorangutan package
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-959581028


   @nvazquez a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-960423129


   @blueorangutan package 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd closed pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rhtyd closed pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1003969423


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1001936552


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-961180021






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#discussion_r777694727



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -5631,35 +5640,72 @@ private void checkConcurrentJobsPerDatastoreThreshhold(final StoragePool destPoo
 
         final List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vm.getId(),
-                VmWorkAddVmToNetwork.class.getName());
+                VmWorkAddVmToNetwork.class.getName(), network.getUuid());
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            assert pendingWorkJobs.size() == 1;
+            if (pendingWorkJobs.size() > 1) {
+                s_logger.warn(String.format("The number of jobs to add network %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
+            }
             workJob = pendingWorkJobs.get(0);
         } else {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace(String.format("no jobs to add network %s for vm %s yet", network, vm));
+            }
 
-            workJob = new VmWorkJobVO(context.getContextId());
+            workJob = createVmWorkJobToAddNetwork(vm, network, requested, context, user, account);
+        }
+        AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(workJob.getId());
 
-            workJob.setDispatcher(VmWorkConstants.VM_WORK_JOB_DISPATCHER);
-            workJob.setCmd(VmWorkAddVmToNetwork.class.getName());
+        if (s_logger.isTraceEnabled()) {
+            s_logger.trace(String.format("job %s to add network %s for vm %s processed", workJob.toString(), network, vm));
+        }
+        if (workJob.getStep() == VmWorkJobVO.Step.Done ||
+            workJob.getStep() == VmWorkJobVO.Step.Error ||
+            workJob.getStep() == VmWorkJobVO.Step.Release) {
+            _workJobDao.expunge(workJob.getId());
+        }

Review comment:
       @weizhouapache the regression that this caused was that the nic couldn't be re-added because the workjob remained in the DB. Are you sure removing it here isn't needed?




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache removed a comment on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache removed a comment on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1005615680


   @blueorangutan package


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rohityadavcloud commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
rohityadavcloud commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007877506


   Is this ready for merging, or needs testing @DaanHoogland @weizhouapache ?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] weizhouapache commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
weizhouapache commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007392439


   > fully works for adding in parallel and re-adding. I did notice however that deleting in parallel sometimes doesn't work. We will need to revisit the general area of this functionality again in the future @blueorangutan test matrix
   
   great ! @DaanHoogland 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007301700






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1008656137


   > Is this ready for merging, or needs testing @DaanHoogland @weizhouapache @sureshanaparti ?
   
   I have tested it but I am (co-)author It has my lgtm ;)
   I'll add a brief test description.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5658: remove VmWorkJob after adding a nic to a vm

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5658:
URL: https://github.com/apache/cloudstack/pull/5658#issuecomment-1007783144


   <b>Trillian test result (tid-2828)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31586 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5658-t2828-kvm-centos7.zip
   Smoke tests completed. 89 look OK, 3 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
   ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
   ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
   ContextSuite context=TestVPCNics>:setup | `Error` | 0.00 | test_vpc_router_nics.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org