cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to 58a9a9b
Date Fri, 17 Jan 2014 19:50:29 GMT
Updated Branches:
  refs/heads/master 8a20d89d1 -> 58a9a9b0c


only send stop command when agent reports VM running and CS thinks it is stopped.


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

Branch: refs/heads/master
Commit: 58a9a9b0cd57905873eb1541cb646e69d4d7fb57
Parents: 8a20d89
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Fri Jan 17 11:48:27 2014 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Fri Jan 17 11:50:13 2014 -0800

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58a9a9b0/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 806ac7e..89a0258 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2750,7 +2750,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
                         s_logger.warn(e.getMessage());
                     }
                 }
-            } else if (serverState == State.Stopping) {
+            } else if (serverState == State.Stopped) {
                 s_logger.debug("Scheduling a stop command for " + vm);
                 _haMgr.scheduleStop(vm, hostId, WorkType.Stop);
             } else {


Mime
View raw message