cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [11/13] git commit: updated refs/heads/master to 1e2e1ea
Date Thu, 09 Jan 2014 22:33:59 GMT
Fix a typo caused problem in attach-volume process


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/737a382c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/737a382c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/737a382c

Branch: refs/heads/master
Commit: 737a382c385ae371a69fd2c773344584355176c4
Parents: ac0faeb
Author: Kelven Yang <kelveny@gmail.com>
Authored: Tue Dec 31 15:12:54 2013 -0800
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Thu Jan 9 14:29:12 2014 -0800

----------------------------------------------------------------------
 .../components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java | 4 +---
 .../src/com/cloud/vm/VmWorkJobWakeupDispatcher.java            | 6 ++++++
 server/src/com/cloud/storage/VolumeApiServiceImpl.java         | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/737a382c/engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java b/engine/components-api/src/com/cloud/vm/VmWorkJobHandlerProxy.java
index ce10a83..574e60f 100644
--- 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 class VmWorkJobHandlerProxy implements VmWorkJobHandler {
 
                 // 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;
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/737a382c/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java b/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java
index 5704f97..520a550 100644
--- 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.user.dao.AccountDao;
 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);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/737a382c/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 179a10c..f453289 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -2360,7 +2360,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         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);
     }


Mime
View raw message