From 1f53790626df9a8b36e29d76dd835c06fff7ae08 Mon Sep 17 00:00:00 2001 From: anthony Date: Fri, 27 Jan 2012 10:06:53 -0800 Subject: [PATCH] bug 13338: increate timeout for sshcheck to 10 minutes if sshcheck fails, finalizeCommandsOnStart fails, no exception status 13338: resolved fixed Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java --- api/src/com/cloud/agent/api/check/CheckSshCommand.java | 6 +++--- .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../cloud/network/lb/ElasticLoadBalancerManagerImpl.java | 2 +- .../network/router/VirtualNetworkApplianceManagerImpl.java | 3 +-- .../storage/secondary/SecondaryStorageManagerImpl.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/src/com/cloud/agent/api/check/CheckSshCommand.java b/api/src/com/cloud/agent/api/check/CheckSshCommand.java index b36c5a9dee4..718d2e5e08f 100644 --- a/api/src/com/cloud/agent/api/check/CheckSshCommand.java +++ b/api/src/com/cloud/agent/api/check/CheckSshCommand.java @@ -30,12 +30,12 @@ public class CheckSshCommand extends Command { super(); } - public CheckSshCommand(String instanceName, String ip, int port, int interval, int retries) { + public CheckSshCommand(String instanceName, String ip, int port) { super(); this.ip = ip; this.port = port; - this.interval = interval; - this.retries = retries; + this.interval = 6; + this.retries = 100; this.name = instanceName; } diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 8101789425a..a865fd72ca5 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -1408,7 +1408,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx controlNic = managementNic; } - CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922, 5, 20); + CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922); cmds.addCommand("checkSsh", check); return true; diff --git a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index 18866985de6..aed34e18082 100644 --- a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -940,7 +940,7 @@ public class ElasticLoadBalancerManagerImpl implements return false; } - cmds.addCommand("checkSsh", new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922, 5, 20)); + cmds.addCommand("checkSsh", new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922)); // Re-apply load balancing rules List lbs = _elbVmMapDao.listLbsForElbVm(elbVm.getId()); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 713fcfdfe91..dcd4c11db36 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1618,7 +1618,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian return false; } - cmds.addCommand("checkSsh", new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922, 5, 20)); + cmds.addCommand("checkSsh", new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922)); // Network usage command to create iptables rules cmds.addCommand("networkUsage", new NetworkUsageCommand(controlNic.getIp4Address(), router.getHostName(), "create")); @@ -1748,7 +1748,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian s_logger.warn("Unable to ssh to the VM: " + answer.getDetails()); return false; } - return true; } diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index bd0fab62fd8..1485b9cc324 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1059,7 +1059,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V controlNic = managementNic; } - CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922, 5, 20); + CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922); cmds.addCommand("checkSsh", check); return true;