From 381f3df553dd446a62fd1949553aeb3f0fa2a361 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Mon, 22 Aug 2011 16:33:47 -0700
Subject: [PATCH] bug 11208: When agent reported state is out of sync with
 CloudStack, stop VM when its state in CloudStack is not in Running or
 Migrating

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

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index d62d98f7a0a..102271e3f80 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1652,7 +1652,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                         s_logger.warn(e.getMessage());
                     }
                 }
-            } else if (serverState == State.Stopping) {
+            } else if (serverState == State.Stopping || serverState == State.Stopped || serverState == State.Expunging || serverState == State.Destroyed || serverState == State.Error) {
                 s_logger.debug("Scheduling a stop command for " + vm);
                 _haMgr.scheduleStop(vm, hostId, WorkType.Stop);
             } else {