[PATCH 4/8] cts: fix quourm command

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Angus Salkeld <asalkeld@xxxxxxxxxx>
---
 cts/corosync.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cts/corosync.py b/cts/corosync.py
index 5524e50..2b79b23 100644
--- a/cts/corosync.py
+++ b/cts/corosync.py
@@ -114,6 +114,7 @@ class corosync_needle(ClusterManager):
             "StableTime"     : 10,
             "BreakCommCmd"   : "/usr/share/corosync/tests/net_breaker.sh BreakCommCmd %s",
             "FixCommCmd"     : "/usr/share/corosync/tests/net_breaker.sh FixCommCmd %s",
+            "QuorumCmd"      : "corosync-quorumtool -s",
 
             "Pat:We_stopped"   : "%s.*Corosync Cluster Engine exiting.*",
             "Pat:They_stopped" : "%s.*Member left:.*%s.*",
@@ -316,13 +317,13 @@ class corosync_needle(ClusterManager):
 
         for node in node_list:
             if self.ShouldBeStatus[node] == "up":
-                quorum = self.rsh(node, self["QuorumCmd"], 1)
-                if string.find(quorum, "1") != -1:
+                (quorum, qout) = self.rsh(node, self["QuorumCmd"], stdout=2)
+                if quorum == 1:
                     return 1
-                elif string.find(quorum, "0") != -1:
+                elif quorum == 0:
                     return 0
                 else:
-                    self.log("WARN: Unexpected quorum test result from "+ node +":"+ quorum)
+                    self.log("WARN: Unexpected quorum test result from %s : %d" % (node, quorum))
 
         return 0
 
-- 
1.7.7.5

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss


[Index of Archives]     [Linux Clusters]     [Corosync Project]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Linux Kernel]     [Linux SCSI]     [X.Org]

  Powered by Linux