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

Merge pull request #2015 from sudhansu7/CLOUDSTACK-9843 

CLOUDSTACK-9843 : Performance improvement of SSHHelper
This commit is contained in:
Rajani Karuturi 2017-06-06 15:47:34 +05:30 committed by GitHub
parent 6f5bc8962a 28bb8ba1e4
commit 8f2ed7b492
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
View File

@ -39,12 +39,6 @@ public class SshHelper {
private static final int DEFAULT_CONNECT_TIMEOUT = 180000;
private static final int DEFAULT_KEX_TIMEOUT = 60000;
/**
* Waiting time to check if the SSH session was successfully opened. This value (of 1000
* milliseconds) represents one (1) second.
*/
private static final long WAITING_OPEN_SSH_SESSION = 1000;
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 {
@ -236,14 +230,9 @@ public class SshHelper {
}
}
/**
* It gets a {@link Session} from the given {@link Connection}; then, it waits
* {@value #WAITING_OPEN_SSH_SESSION} milliseconds before returning the session, given a time to
* ensure that the connection is open before proceeding the execution.
*/
protected static Session openConnectionSession(Connection conn) throws IOException, InterruptedException {
Session sess = conn.openSession();
Thread.sleep(WAITING_OPEN_SSH_SESSION);
return sess;
}

2
utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java
View File

@ -146,6 +146,6 @@ public class SshHelperTest {
Mockito.verify(conn).openSession();
PowerMockito.verifyStatic();
Thread.sleep(Mockito.anyLong());
}
}