Updated Branches:
  refs/heads/4.2 3e962f8d2 -> d61e60b71

CLOUDSTACK-4915, CLOUDSTACK-4933 : Revert "CLOUDSTACK-4911 - [Mixed Hypervisor] 
VM Status is marked as alive when exit status of ping command is not available 
within command timeout"

This reverts commit b6a13d125773371813734e87bd39c6030707f97c.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d61e60b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d61e60b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d61e60b7

Branch: refs/heads/4.2
Commit: d61e60b71a38be037737c059e10030a593a0e710
Parents: 3e962f8
Author: Kishan Kavala <[email protected]>
Authored: Wed Oct 23 12:35:38 2013 +0530
Committer: Kishan Kavala <[email protected]>
Committed: Wed Oct 23 12:35:38 2013 +0530

----------------------------------------------------------------------
 utils/src/com/cloud/utils/ssh/SshHelper.java | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d61e60b7/utils/src/com/cloud/utils/ssh/SshHelper.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/ssh/SshHelper.java 
b/utils/src/com/cloud/utils/ssh/SshHelper.java
index 667b3e3..fb81e50 100755
--- a/utils/src/com/cloud/utils/ssh/SshHelper.java
+++ b/utils/src/com/cloud/utils/ssh/SshHelper.java
@@ -185,12 +185,6 @@ public class SshHelper {
             }
             
             String result = sbResult.toString();
-
-            if (sess.getExitStatus() == null) {
-                //Exit status is NOT available. Returning failure result.
-                return new Pair<Boolean, String>(false, result);
-            }
-
             if (sess.getExitStatus() != null && 
sess.getExitStatus().intValue() != 0) {
                 s_logger.error("SSH execution of command " + command + " has 
an error status code in return. result output: " + result);
                 return new Pair<Boolean, String>(false, result);

Reply via email to