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

JschSshClinet bug fix for exec method

This commit is contained in:
Dmitri Babaev 2011-06-01 22:26:08 +04:00
parent ebf3527595
commit 6dc6d3581f
1 changed files with 324 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
View File

@ -261,36 +261,53 @@ public class JschSshClient implements SshClient {
public ExecResponse exec(String command) { public ExecResponse exec(String command) {
checkConnected(); checkConnected();
ChannelExec executor = null; ChannelExec executor = null;
try { ByteArrayOutputStream error = null;
int j = 0;
do {
try { try {
executor = (ChannelExec) session.openChannel("exec"); executor = (ChannelExec) session.openChannel("exec");
executor.setPty(true);
} catch (JSchException e) { } catch (JSchException e) {
// unrecoverable fail because ssh session closed
throw new SshException(String.format("%s@%s:%d: Error connecting to exec.", username, host, port), e); throw new SshException(String.format("%s@%s:%d: Error connecting to exec.", username, host, port), e);
} }
error = new ByteArrayOutputStream();
executor.setPty(true);
executor.setCommand(command); executor.setCommand(command);
ByteArrayOutputStream error = new ByteArrayOutputStream();
executor.setErrStream(error); executor.setErrStream(error);
try { try {
executor.connect(); executor.connect();
String outputString = Strings2.toStringAndClose(executor.getInputStream()); } catch (JSchException e) {
String errorString = error.toString(); executor.disconnect();
int errorStatus = executor.getExitStatus(); backoffForAttempt(++j, String.format("%s@%s:%d: Failed to connect ChannelExec", username, host, port));
int i = 0;
while ((errorStatus = executor.getExitStatus()) == -1 && i < this.sshRetries)
backoffForAttempt(++i, String.format("%s@%s:%d: bad status: -1", username, host, port));
if (errorStatus == -1)
throw new SshException(String.format("%s@%s:%d: received exit status %d executing %s", username, host,
port, executor.getExitStatus(), command));
return new ExecResponse(outputString, errorString, errorStatus);
} catch (Exception e) {
throw new SshException(String
.format("%s@%s:%d: Error executing command: %s", username, host, port, command), e);
} }
} finally { } while (j < this.sshRetries && !executor.isConnected());
if (executor != null)
executor.disconnect(); if (!executor.isConnected())
throw new SshException(String.format("%s@%s:%d: Failed to connect ChannelExec executing %s",
username, host, port, command));
try {
String outputString = Strings2.toStringAndClose(executor.getInputStream());
String errorString = error.toString();
int errorStatus = executor.getExitStatus();
int i = 0;
while ((errorStatus = executor.getExitStatus()) == -1 && i < this.sshRetries)
backoffForAttempt(++i, String.format("%s@%s:%d: bad status: -1", username, host, port));
if (errorStatus == -1)
throw new SshException(String.format("%s@%s:%d: received exit status %d executing %s", username, host,
port, executor.getExitStatus(), command));
return new ExecResponse(outputString, errorString, errorStatus);
} catch (Exception e) {
throw new SshException(String
.format("%s@%s:%d: Error executing command: %s", username, host, port, command), e);
}
finally {
executor.disconnect();
} }
} }