From 7255d6887532189bb01d6b9fe5b8513d339697ef Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 22 Apr 2011 13:36:26 -0700
Subject: [PATCH] HA: no need to investigate why vm was stopped on host when
 host is being Dicsonnected with investigate=false option

---
 server/src/com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
 server/src/com/cloud/ha/HighAvailabilityManager.java     | 3 ++-
 server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index a387ce3d66b..cb7638d9c52 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1588,7 +1588,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
 
         host = _hostDao.findById(host.getId());
         if (host.getStatus() == Status.Alert || host.getStatus() == Status.Down) {
-            _haMgr.scheduleRestartForVmsOnHost(host);
+            _haMgr.scheduleRestartForVmsOnHost(host, investigate);
         }
 
         for (Pair<Integer, Listener> monitor : _hostMonitors) {
diff --git a/server/src/com/cloud/ha/HighAvailabilityManager.java b/server/src/com/cloud/ha/HighAvailabilityManager.java
index fa9e1496d03..d12b3d94053 100644
--- a/server/src/com/cloud/ha/HighAvailabilityManager.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManager.java
@@ -78,8 +78,9 @@ public interface HighAvailabilityManager extends Manager {
     /**
      * Schedule restarts for all vms running on the host.
      * @param host host.
+     * @param investigate TODO
      */
-    void scheduleRestartForVmsOnHost(HostVO host);
+    void scheduleRestartForVmsOnHost(HostVO host, boolean investigate);
 
     /**
      * Schedule the vm for migration.
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index b8567b7466c..1326b34a211 100644
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -179,7 +179,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu
     }
 
     @Override
-    public void scheduleRestartForVmsOnHost(final HostVO host) {
+    public void scheduleRestartForVmsOnHost(final HostVO host, boolean investigate) {
 
         if (host.getType() != Host.Type.Routing) {
             return;
@@ -216,9 +216,9 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu
 
         for (final VMInstanceVO vm : vms) {
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug("Notifying HA Mgr of to investigate vm " + vm.getId() + "-" + vm.getName());
+                s_logger.debug("Notifying HA Mgr of to restart vm " + vm.getId() + "-" + vm.getName());
             }
-            scheduleRestart(vm, true);
+            scheduleRestart(vm, investigate);
         }
     }