perform VM HA based on agent state report.

kelveny · kelveny · commit 7fa4715b996f · 2014-03-13T16:59:56.000-07:00
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -393,8 +393,12 @@ public void scheduleRestart(VMInstanceVO vm, boolean investigate) {
             }
         }
 
-        HaWorkVO work =
-            new HaWorkVO(vm.getId(), vm.getType(), WorkType.HA, investigate ? Step.Investigating : Step.Scheduled, hostId, vm.getState(), maxRetries + 1, vm.getUpdated());
+        if (hostId == null) {
+            hostId = vm.getLastHostId();
+        }
+
+        HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.HA, investigate ? Step.Investigating : Step.Scheduled,
+                hostId != null ? hostId : 0L, vm.getState(), maxRetries + 1, vm.getUpdated());
         _haDao.persist(work);
 
         if (s_logger.isInfoEnabled()) {
@@ -962,15 +966,15 @@ public boolean postStateTransitionEvent(State oldState, VirtualMachine.Event eve
         if (oldState == State.Running && event == VirtualMachine.Event.FollowAgentPowerOffReport && newState == State.Stopped) {
             final VMInstanceVO vm = _instanceDao.findById(vo.getId());
             if (vm.isHaEnabled()) {
-                if (vm.getState() == State.Stopped)
+                if (vm.getState() != State.Stopped)
                     s_logger.warn("Sanity check failed. postStateTransitionEvent reports transited to Stopped but VM " + vm + " is still at state " + vm.getState());
 
                 s_logger.info("Detected out-of-band stop of a HA enabled VM " + vm.getInstanceName() + ", will schedule restart");
                 _executor.submit(new ManagedContextRunnable() {
                     @Override
                     protected void runInContext() {
                         try {
-                            scheduleRestart(vm, true);
+                            scheduleRestart(vm, false);
                         } catch (Exception e) {
                             s_logger.warn("Unexpected exception when scheduling a HA restart", e);
                         }
