cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/master to 7483156
Date Mon, 21 Oct 2013 16:37:09 GMT
Updated Branches:
  refs/heads/master 90521a3e1 -> 748315620


CLOUDSTACK-4911 - [Mixed Hypervisor] VM Status is marked as alive when exit status of ping
command is not available within command timeout

Currently during ssh execution of remote command, if no response is received within timeout,
Cloudstack is returning success result.
This is resulting in false positives. Fix is to check if exit status of remote command is
available or not. If not, return failure result.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>


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

Branch: refs/heads/master
Commit: 748315620bbbc472652e38df960d136beee4882e
Parents: 90521a3
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Mon Oct 21 16:31:45 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Mon Oct 21 16:34:57 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74831562/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 fb81e50..667b3e3 100755
--- a/utils/src/com/cloud/utils/ssh/SshHelper.java
+++ b/utils/src/com/cloud/utils/ssh/SshHelper.java
@@ -185,6 +185,12 @@ 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);


Mime
View raw message