CLOUDSTACK-9843 : Performance improvement of deployVirtualMachine, createFirewallRule, createPortForwardingRule

Sudhansu · Rohit Yadav · commit 1535afe15861 · 2017-08-01T20:40:25.000+02:00
removed 1 sec sleep in SSHHelper. (cherry picked from commit 28bb8ba) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
@@ -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 static Pair<Boolean, String> sshExecute(String host, int port, String use
         }
     }
 
-    /**
-     * 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;
     }
 
diff --git a/utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java b/utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java
@@ -146,6 +146,6 @@ public void openConnectionSessionTest() throws IOException, InterruptedException
         Mockito.verify(conn).openSession();
 
         PowerMockito.verifyStatic();
-        Thread.sleep(Mockito.anyLong());
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,6 @@ public void openConnectionSessionTest() throws IOException, InterruptedException`
`146`	`146`	`Mockito.verify(conn).openSession();`
`147`	`147`
`148`	`148`	`PowerMockito.verifyStatic();`
`149`		`- Thread.sleep(Mockito.anyLong());`
	`149`	`+`
`150`	`150`	`}`
`151`	`151`	`}`