etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
anthony 2012-01-27 10:06:53 -08:00
parent 1203063fef
commit 1f53790626
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/agent/api/check/CheckSshCommand.java
View File

@ -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;
}

2
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -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;

2
server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
View File

@ -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<LoadBalancerVO> lbs = _elbVmMapDao.listLbsForElbVm(elbVm.getId());

3
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -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;
}

2
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
View File

@ -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;