From aa757f0303d6809b89725575e40b9e4d65c6e852 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Fri, 8 Jul 2011 00:05:29 -0700 Subject: [PATCH] fixed the problem that vms in starting state were not being cleaned up when management server restarts --- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 798f8f5b3dd..1f4c6ac507a 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -65,7 +65,6 @@ import com.cloud.cluster.ClusterManager; import com.cloud.cluster.StackMaid; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; -import com.cloud.configuration.ResourceCount.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.consoleproxy.ConsoleProxyManager; import com.cloud.dc.DataCenter; @@ -935,7 +934,10 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene throw new ConcurrentOperationException("VM is being operated on."); } } catch (NoTransitionException e1) { - throw new CloudRuntimeException("We cannot stop " + vm + " when it is in state " + vm.getState()); + if (!forced) { + throw new CloudRuntimeException("We cannot stop " + vm + " when it is in state " + vm.getState()); + } + s_logger.debug("Unable to transition the state but we're moving on because it's forced stop"); } VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);