gitqueue
diff --git a/‎engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java‎
Lines changed: 10 additions & 2 deletions b/‎engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java‎
Lines changed: 10 additions & 2 deletions
diff --git a/‎engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java‎
Lines changed: 1 addition & 1 deletion b/‎engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎server/src/com/cloud/ha/HighAvailabilityManagerImpl.java‎
Lines changed: 2 additions & 8 deletions b/‎server/src/com/cloud/ha/HighAvailabilityManagerImpl.java‎
Lines changed: 2 additions & 8 deletions
@@ -1469,8 +1469,16 @@ protected void runInContext() {
                             status_logger.debug("Ping timeout but host " + agentId + " is in resource state of " + resourceState + ", so no investigation");
                             disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);
                         } else {
-                            status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");
-                            disconnectWithInvestigation(agentId, Event.PingTimeout);
+                            HostVO host = _hostDao.findById(agentId);
+                            if (host != null && (host.getType() == Host.Type.ConsoleProxy || host.getType() == Host.Type.SecondaryStorageVM
+                                    || host.getType() == Host.Type.SecondaryStorageCmdExecutor)) {
+
+                                s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId());
+                                disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);
+                            } else {
+                                status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");
+                                disconnectWithInvestigation(agentId, Event.PingTimeout);
+                            }
                         }
                     }
                 }
 
@@ -182,7 +182,7 @@ private void bailout() {
                 Command[] cmds = _req.getCommands();
                 ArrayList<Answer> answers = new ArrayList<Answer>(cmds.length);
                 for (Command cmd : cmds) {
-                    Answer answer = new Answer(cmd, false, "Bailed out as maximum oustanding task limit reached");
+                    Answer answer = new Answer(cmd, false, "Bailed out as maximum outstanding task limit reached");
                     answers.add(answer);
                 }
                 Response resp = new Response(_req, answers.toArray(new Answer[answers.size()]));
 
@@ -63,7 +63,6 @@
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.resource.ResourceManager;
 import com.cloud.server.ManagementServer;
-import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.dao.GuestOSCategoryDao;
@@ -952,13 +951,8 @@ public boolean preStateTransitionEvent(State oldState, VirtualMachine.Event even
     @Override
     public boolean postStateTransitionEvent(State oldState, VirtualMachine.Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
         if (oldState == State.Running && event == VirtualMachine.Event.FollowAgentPowerOffReport && newState == State.Stopped) {
-            long serviceOfferingId = vo.getServiceOfferingId();
-
-            ServiceOfferingVO serviceOffering = _serviceOfferingDao.findById(serviceOfferingId);
-            if (serviceOffering != null && serviceOffering.getOfferHA()) {
-
-                VMInstanceVO vm = _instanceDao.findById(vo.getId());
-
+            VMInstanceVO vm = _instanceDao.findById(vo.getId());
+            if (vm.isHaEnabled()) {
                 s_logger.info("Detected out-of-band stop of a HA enabled VM " + vm.getInstanceName() + ", will schedule restart");
                 scheduleRestart(vm, true);
             }
Original file line number	Diff line number	Diff line change
`@@ -1469,8 +1469,16 @@ protected void runInContext() {`
`1469`	`1469`	`status_logger.debug("Ping timeout but host " + agentId + " is in resource state of " + resourceState + ", so no investigation");`
`1470`	`1470`	`disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);`
`1471`	`1471`	`} else {`
`1472`		`- status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");`
`1473`		`- disconnectWithInvestigation(agentId, Event.PingTimeout);`
	`1472`	`+ HostVO host = _hostDao.findById(agentId);`
	`1473`	`+ if (host != null && (host.getType() == Host.Type.ConsoleProxy \|\| host.getType() == Host.Type.SecondaryStorageVM`
	`1474`	`+ \|\| host.getType() == Host.Type.SecondaryStorageCmdExecutor)) {`
	`1475`	`+`
	`1476`	`+ s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId());`
	`1477`	`+ disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);`
	`1478`	`+ } else {`
	`1479`	`+ status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");`
	`1480`	`+ disconnectWithInvestigation(agentId, Event.PingTimeout);`
	`1481`	`+ }`
`1474`	`1482`	`}`
`1475`	`1483`	`}`
`1476`	`1484`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private void bailout() {`
`182`	`182`	`Command[] cmds = _req.getCommands();`
`183`	`183`	`ArrayList<Answer> answers = new ArrayList<Answer>(cmds.length);`
`184`	`184`	`for (Command cmd : cmds) {`
`185`		`- Answer answer = new Answer(cmd, false, "Bailed out as maximum oustanding task limit reached");`
	`185`	`+ Answer answer = new Answer(cmd, false, "Bailed out as maximum outstanding task limit reached");`
`186`	`186`	`answers.add(answer);`
`187`	`187`	`}`
`188`	`188`	`Response resp = new Response(_req, answers.toArray(new Answer[answers.size()]));`