gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-02 21:38:30 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

CLOUDSTACK-8611. CS waits indefinitely for CheckS2SVpnConnectionsCommand to return.

Browse Source 
While remote executing commands through ssh, handle channel condition of EOF because we wait for the the condition.
This commit is contained in:
Likitha Shetty 2015-05-01 16:44:51 +05:30
parent 896f6b1e5e
commit b9181c689e
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
utils/src/com/cloud/utils/ssh/SshHelper.java
View File

@ -146,6 +146,14 @@ public class SshHelper {
}
sess = conn.openSession();
Thread.sleep(1000);
if (sess == null) {
String msg = "Cannot open SSH session";
s_logger.error(msg);
throw new Exception(msg);
}
sess.execCommand(command);
InputStream stdout = sess.getStdout();
@ -156,6 +164,12 @@ public class SshHelper {
int currentReadBytes = 0;
while (true) {
if (stdout == null || stderr == null) {
String msg = "Stdout or Stderr of SSH session is null";
s_logger.error(msg);
throw new Exception(msg);
}
if ((stdout.available() == 0) && (stderr.available() == 0)) {
int conditions =
sess.waitForCondition(ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA | ChannelCondition.EOF | ChannelCondition.EXIT_STATUS,
@ -172,6 +186,22 @@ public class SshHelper {
break;
}
}
if ((conditions & ChannelCondition.EOF) != 0) {
if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) {
int newConditions = sess.waitForCondition(ChannelCondition.EXIT_STATUS, waitResultTimeoutInMs);
if ((newConditions & ChannelCondition.TIMEOUT) != 0) {
String msg = "Timed out in waiting for SSH execution exit status";
s_logger.error(msg);
throw new Exception(msg);
}
if ((newConditions & ChannelCondition.EXIT_STATUS) != 0) {
if ((newConditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) {
break;
}
}
}
}
}
while (stdout.available() > 0) {
@ -189,6 +219,7 @@ public class SshHelper {
if (sess.getExitStatus() == null) {
//Exit status is NOT available. Returning failure result.
s_logger.error("SSH execution of command " + command + " has no exit status set. result output: " + result);
return new Pair<Boolean, String>(false, result);
}