mirror of https://github.com/apache/jclouds.git
regression on jsch
This commit is contained in:
parent
dcbcf698f0
commit
d034a737b1
|
@ -22,7 +22,6 @@ import java.util.Map;
|
|||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.google.common.base.Predicate;
|
||||
import org.jclouds.compute.domain.NodeMetadata;
|
||||
import org.jclouds.compute.options.RunScriptOptions;
|
||||
import org.jclouds.compute.util.ComputeUtils;
|
||||
|
|
|
@ -339,7 +339,7 @@ public abstract class BaseComputeServiceLiveTest {
|
|||
|
||||
@Test(enabled = true, dependsOnMethods = "testGet")
|
||||
public void testReboot() throws Exception {
|
||||
client.rebootNodesWithTag(tag);
|
||||
client.rebootNodesWithTag(tag);// TODO test validation
|
||||
testGet();
|
||||
}
|
||||
|
||||
|
|
|
@ -162,11 +162,14 @@ public class JschSshClient implements SshClient {
|
|||
@PostConstruct
|
||||
public void connect() {
|
||||
disconnect();
|
||||
Exception e = null;
|
||||
RETRY_LOOP: for (int i = 0; i < sshRetries; i++) {
|
||||
try {
|
||||
newSession();
|
||||
e = null;
|
||||
break RETRY_LOOP;
|
||||
} catch (Exception from) {
|
||||
e = from;
|
||||
disconnect();
|
||||
String rootMessage = Throwables.getRootCause(from).getMessage();
|
||||
if (i == sshRetries)
|
||||
|
@ -190,6 +193,8 @@ public class JschSshClient implements SshClient {
|
|||
throw propagate(from);
|
||||
}
|
||||
}
|
||||
if (e != null)
|
||||
throw propagate(e);
|
||||
}
|
||||
|
||||
private void newSession() throws JSchException {
|
||||
|
|
Loading…
Reference in New Issue