HA VM with local storage works

Anthony Xu · Anthony Xu · commit fefb0028fe25 · 2014-07-29T16:31:33.000-07:00
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -560,7 +560,8 @@ protected Long restart(HaWorkVO work) {
             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.");
             }

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,8 @@ protected Long restart(HaWorkVO work) {`
`560`	`560`	`return null; // VM doesn't require HA`
`561`	`561`	`}`
`562`	`562`
`563`		`- if (!volumeMgr.canVmRestartOnAnotherServer(vm.getId())) {`
	`563`	`+ if ((host == null \|\| host.getRemoved() != null \|\| host.getState() != Status.Up)`
	`564`	`+ && !volumeMgr.canVmRestartOnAnotherServer(vm.getId())) {`
`564`	`565`	`if (s_logger.isDebugEnabled()) {`
`565`	`566`	`s_logger.debug("VM can not restart on another server.");`
`566`	`567`	`}`