cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/4.3 to e51892a
Date Fri, 20 Dec 2013 19:20:12 GMT
Updated Branches:
  refs/heads/4.3 aaf3979cf -> e51892abd


CLOUDSTACK-5582: reload vm state after vm been force stopped


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

Branch: refs/heads/4.3
Commit: e51892abd5d11ee1f11cf3d21233133c9ecc54a4
Parents: aaf3979
Author: Edison Su <sudison@gmail.com>
Authored: Fri Dec 20 11:19:31 2013 -0800
Committer: Edison Su <sudison@gmail.com>
Committed: Fri Dec 20 11:19:53 2013 -0800

----------------------------------------------------------------------
 server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e51892ab/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index b2c1034..4bf8bb2 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -29,7 +29,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.deploy.HAPlanner;
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContext;
@@ -47,6 +46,7 @@ import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.HostPodDao;
+import com.cloud.deploy.HAPlanner;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -344,6 +344,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements
HighAvai
 
             try {
                 _itMgr.advanceStop(vm.getUuid(), true);
+                vm = _instanceDao.findByUuid(vm.getUuid());
             } catch (ResourceUnavailableException e) {
                 assert false : "How do we hit this when force is true?";
             throw new CloudRuntimeException("Caught exception even though it should be handled.",
e);


Mime
View raw message