From fefb0028fe25f130aad9b84bd93ebbc2da1b1142 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Tue, 29 Jul 2014 16:30:29 -0700 Subject: [PATCH] HA VM with local storage works --- server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index 1318d9b8c76..310f361c08f 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -560,7 +560,8 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai return null; // VM doesn't require HA } - if (!volumeMgr.canVmRestartOnAnotherServer(vm.getId())) { + if ((host == null || host.getRemoved() != null || host.getState() != Status.Up) + && !volumeMgr.canVmRestartOnAnotherServer(vm.getId())) { if (s_logger.isDebugEnabled()) { s_logger.debug("VM can not restart on another server."); }