CLOUDSTACK-8079: If the cluster capacity threshold is reached, HA-enabled VM is not migrated on another host during HA

Prachi Damle · Prachi Damle · commit a7861aa5faab · 2014-12-17T13:48:24.000-08:00
Changes:
-  When there is HA we try to redeploy the affected vm using regular planners and if that fails we retry using the special planner for HA (which skips checking disable threshold)
Now because of job framework the InsufficientCapacittyException gets masked and the special planners are not called. Job framework needs to be fixed to rethrow the correct exception.
- Also the VM Work Job framework is  not setting the DeploymentPlanner to the VmWorkJob.  So the HA Planner being passed by HAMgr was not getting used.
- Now the job framework sets the planner passed in by any caller of the VM Start operation, to the job
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3949,6 +3949,9 @@ public Outcome<VirtualMachine> startVmThroughJobQueue(final String vmUuid,
             VmWorkStart workInfo = new VmWorkStart(callingUser.getId(), callingAccount.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER);
             workInfo.setPlan(planToDeploy);
             workInfo.setParams(params);
+            if (planner != null) {
+                workInfo.setDeploymentPlanner(planner.getName());
+            }
             workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
 
             _jobMgr.submitAsyncJob(workJob, VmWorkConstants.VM_WORK_QUEUE, vm.getId());
diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java b/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
@@ -111,8 +111,8 @@ public void runJob(AsyncJob job) {
         } catch(Throwable e) {
             s_logger.error("Unable to complete " + job + ", job origin:" + job.getRelated(), e);
 
-            RuntimeException ex = new RuntimeException("Job failed due to exception " + e.getMessage());
-            _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, _asyncJobMgr.marshallResultObject(ex));
+            //RuntimeException ex = new RuntimeException("Job failed due to exception " + e.getMessage());
+            _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, _asyncJobMgr.marshallResultObject(e));
         }
     }
 }
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -925,6 +925,9 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
                     if (jobResult instanceof ConcurrentOperationException) {
                         throw (ConcurrentOperationException)jobResult;
                     }
+                    else if (jobResult instanceof ResourceAllocationException) {
+                        throw (ResourceAllocationException)jobResult;
+                    }
                     else if (jobResult instanceof RuntimeException) {
                         throw (RuntimeException)jobResult;
                     }

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ public void runJob(AsyncJob job) {`
`111`	`111`	`} catch(Throwable e) {`
`112`	`112`	`s_logger.error("Unable to complete " + job + ", job origin:" + job.getRelated(), e);`
`113`	`113`
`114`		`- RuntimeException ex = new RuntimeException("Job failed due to exception " + e.getMessage());`
`115`		`- _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, _asyncJobMgr.marshallResultObject(ex));`
	`114`	`+ //RuntimeException ex = new RuntimeException("Job failed due to exception " + e.getMessage());`
	`115`	`+ _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, _asyncJobMgr.marshallResultObject(e));`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -925,6 +925,9 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep`
`925`	`925`	`if (jobResult instanceof ConcurrentOperationException) {`
`926`	`926`	`throw (ConcurrentOperationException)jobResult;`
`927`	`927`	`}`
	`928`	`+ else if (jobResult instanceof ResourceAllocationException) {`
	`929`	`+ throw (ResourceAllocationException)jobResult;`
	`930`	`+ }`
`928`	`931`	`else if (jobResult instanceof RuntimeException) {`
`929`	`932`	`throw (RuntimeException)jobResult;`
`930`	`933`	`}`