when system VM ping times out, stop system VM

Anthony Xu · Anthony Xu · commit 847e1e47aee6 · 2014-09-30T12:35:44.000-07:00
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -775,7 +775,7 @@ protected boolean handleDisconnectWithoutInvestigation(AgentAttache attache, Sta
                 }
 
                 if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("The next status of agent " + hostId + "is " + nextStatus + ", current status is " + currentStatus);
+                    s_logger.debug("The next status of agent " + hostId + " is " + nextStatus + ", current status is " + currentStatus);
                 }
             }
         }
@@ -1513,7 +1513,7 @@ protected void runInContext() {
                                     || 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);
+                                disconnectWithoutInvestigation(agentId, Event.PingTimeout);
                             } else {
                                 status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");
                                 disconnectWithInvestigation(agentId, Event.PingTimeout);
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -324,6 +324,7 @@ public void onAgentDisconnect(long agentId, com.cloud.host.Status state) {
                         final ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId);
                         if (proxy != null) {
 
+                            stopProxy(proxyVmId);
                             // Disable this feature for now, as it conflicts
                             // with
                             // the case of allowing user to reboot console proxy
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java b/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
@@ -88,6 +88,7 @@ public void processConnect(Host agent, StartupCommand cmd, boolean forRebalance)
 
     @Override
     public boolean processDisconnect(long agentId, Status state) {
+        _ssVmMgr.onAgentDisconnect(agentId, state);
         return true;
     }
 
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
@@ -21,6 +21,7 @@
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.host.HostVO;
+import com.cloud.host.Status;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.Manager;
 import com.cloud.vm.SecondaryStorageVmVO;
@@ -45,6 +46,8 @@ public interface SecondaryStorageVmManager extends Manager {
 
     public void onAgentConnect(Long dcId, StartupCommand cmd);
 
+    public void onAgentDisconnect(long agentId, Status state);
+
     public boolean generateFirewallConfiguration(Long agentId);
 
     public boolean generateVMSetupCommand(Long hostId);
diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -78,6 +78,7 @@
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
+import com.cloud.host.Host.Type;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.info.RunningHostCountInfo;
@@ -998,6 +999,20 @@ public boolean destroySecStorageVm(long vmId) {
     public void onAgentConnect(Long dcId, StartupCommand cmd) {
     }
 
+    @Override
+    public void onAgentDisconnect(long agentId, Status state) {
+        HostVO host = _hostDao.findById(agentId);
+        if (host == null || !Type.SecondaryStorageVM.equals(host.getType())) {
+            return;
+        }
+        if (state == Status.Alert || state == Status.Disconnected) {
+            SecondaryStorageVmVO ssvm = getSSVMfromHost(host);
+            if ( ssvm != null ) {
+                stopSecStorageVm(ssvm.getId());
+            }
+        }
+    }
+
     private String getAllocLockName() {
         // to improve security, it may be better to return a unique mashed
         // name(for example MD5 hashed)

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ protected boolean handleDisconnectWithoutInvestigation(AgentAttache attache, Sta`
`775`	`775`	`}`
`776`	`776`
`777`	`777`	`if (s_logger.isDebugEnabled()) {`
`778`		`- s_logger.debug("The next status of agent " + hostId + "is " + nextStatus + ", current status is " + currentStatus);`
	`778`	`+ s_logger.debug("The next status of agent " + hostId + " is " + nextStatus + ", current status is " + currentStatus);`
`779`	`779`	`}`
`780`	`780`	`}`
`781`	`781`	`}`
`@@ -1513,7 +1513,7 @@ protected void runInContext() {`
`1513`	`1513`	`\|\| host.getType() == Host.Type.SecondaryStorageCmdExecutor)) {`
`1514`	`1514`
`1515`	`1515`	`s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId());`
`1516`		`- disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);`
	`1516`	`+ disconnectWithoutInvestigation(agentId, Event.PingTimeout);`
`1517`	`1517`	`} else {`
`1518`	`1518`	`status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");`
`1519`	`1519`	`disconnectWithInvestigation(agentId, Event.PingTimeout);`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public void processConnect(Host agent, StartupCommand cmd, boolean forRebalance)`
`88`	`88`
`89`	`89`	`@Override`
`90`	`90`	`public boolean processDisconnect(long agentId, Status state) {`
	`91`	`+ _ssVmMgr.onAgentDisconnect(agentId, state);`
`91`	`92`	`return true;`
`92`	`93`	`}`
`93`	`94`