You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/01/17 20:49:14 UTC
git commit: updated refs/heads/4.3 to b52e802
Updated Branches:
refs/heads/4.3 be0d68851 -> b52e8028e
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/b52e8028
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b52e8028
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b52e8028
Branch: refs/heads/4.3
Commit: b52e8028e9d1fa3d5cd2679a9b94cefb881afe68
Parents: be0d688
Author: Anthony Xu <an...@citrix.com>
Authored: Fri Jan 17 11:48:27 2014 -0800
Committer: Anthony Xu <an...@citrix.com>
Committed: Fri Jan 17 11:48:27 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/b52e8028/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 0393e39..67858b4 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2824,7 +2824,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 {