Fix a typo caused problem in attach-volume process

kelveny · kelveny · commit 737a382c385a · 2014-01-09T14:29:12.000-08:00
diff --git a/engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java b/engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java
@@ -116,10 +116,8 @@ public Pair<JobInfo.Status, String> handleVmWorkJob(VmWork work) throws Exceptio
 
                 // legacy CloudStack code relies on checked exception for error handling
                 // we need to re-throw the real exception here
-                if (e.getCause() != null && e.getCause() instanceof Exception) {
-                    s_logger.info("Rethrow exception " + e.getCause());
+                if (e.getCause() != null && e.getCause() instanceof Exception)
                     throw (Exception)e.getCause();
-                }
 
                 throw e;
             }
diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java b/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java
@@ -40,6 +40,12 @@
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.dao.VMInstanceDao;
 
+/**
+ * Please note: VmWorkJobWakeupDispatcher is not currently in use. It is designed for event-driven based
+ * job processing model.
+ *
+ * Current code base uses blocking calls to wait for job completion
+ */
 public class VmWorkJobWakeupDispatcher extends AdapterBase implements AsyncJobDispatcher {
     private static final Logger s_logger = Logger.getLogger(VmWorkJobWakeupDispatcher.class);
 
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -2360,7 +2360,7 @@ private Pair<JobInfo.Status, String> orchestrateAttachVolumeToVM(VmWorkAttachVol
         return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null);
     }
 
-    private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkAttachVolume work) throws Exception {
+    private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkDetachVolume work) throws Exception {
         orchestrateDetachVolumeFromVM(work.getVmId(), work.getVolumeId());
         return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null);
     }

Original file line number	Diff line number	Diff line change
`@@ -2360,7 +2360,7 @@ private Pair<JobInfo.Status, String> orchestrateAttachVolumeToVM(VmWorkAttachVol`
`2360`	`2360`	`return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null);`
`2361`	`2361`	`}`
`2362`	`2362`
`2363`		`- private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkAttachVolume work) throws Exception {`
	`2363`	`+ private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkDetachVolume work) throws Exception {`
`2364`	`2364`	`orchestrateDetachVolumeFromVM(work.getVmId(), work.getVolumeId());`
`2365`	`2365`	`return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null);`
`2366`	`2366`	`}`