Repository: cloudstack Updated Branches: refs/heads/master f79b3e1c2 -> 75b68c682
CLOUDSTACK-9202 Bump ssh timeout It seems the VR needs more time for some of its commands. Until we figured out the root cause, this allows the VRs to start again. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c5e899a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c5e899a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c5e899a Branch: refs/heads/master Commit: 1c5e899a2d727d8512a28da76a5e49c9d762d295 Parents: 9be76b3 Author: Remi Bergsma <[email protected]> Authored: Mon Dec 28 15:54:26 2015 +0100 Committer: Remi Bergsma <[email protected]> Committed: Mon Dec 28 15:54:26 2015 +0100 ---------------------------------------------------------------------- utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java | 4 +++- utils/src/main/java/com/cloud/utils/ssh/SshHelper.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c5e899a/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java index e35a3ea..61d01c4 100644 --- a/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java +++ b/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java @@ -29,6 +29,8 @@ import com.trilead.ssh2.Session; public class SSHCmdHelper { private static final Logger s_logger = Logger.getLogger(SSHCmdHelper.class); + private static final int DEFAULT_CONNECT_TIMEOUT = 180000; + private static final int DEFAULT_KEX_TIMEOUT = 60000; public static com.trilead.ssh2.Connection acquireAuthorizedConnection(String ip, String username, String password) { return acquireAuthorizedConnection(ip, 22, username, password); @@ -37,7 +39,7 @@ public class SSHCmdHelper { public static com.trilead.ssh2.Connection acquireAuthorizedConnection(String ip, int port, String username, String password) { com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(ip, port); try { - sshConnection.connect(null, 60000, 60000); + sshConnection.connect(null, DEFAULT_CONNECT_TIMEOUT, DEFAULT_KEX_TIMEOUT); if (!sshConnection.authenticateWithPassword(username, password)) { String[] methods = sshConnection.getRemainingAuthMethods(username); StringBuffer mStr = new StringBuffer(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c5e899a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java index 3aac427..d3c88c8 100644 --- a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java +++ b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java @@ -29,14 +29,14 @@ import com.trilead.ssh2.ChannelCondition; import com.cloud.utils.Pair; public class SshHelper { - private static final int DEFAULT_CONNECT_TIMEOUT = 60000; + private static final int DEFAULT_CONNECT_TIMEOUT = 180000; private static final int DEFAULT_KEX_TIMEOUT = 60000; private static final Logger s_logger = Logger.getLogger(SshHelper.class); public static Pair<Boolean, String> sshExecute(String host, int port, String user, File pemKeyFile, String password, String command) throws Exception { - return sshExecute(host, port, user, pemKeyFile, password, command, 60000, 60000, 120000); + return sshExecute(host, port, user, pemKeyFile, password, command, DEFAULT_CONNECT_TIMEOUT, DEFAULT_KEX_TIMEOUT, 120000); } public static void scpTo(String host, int port, String user, File pemKeyFile, String password, String remoteTargetDirectory, String localFile, String fileMode)
