Signed-off-by: Angus Salkeld <[email protected]>
---
cts/.gitignore | 1 +
cts/corosync.py | 8 ++++----
cts/corotests.py | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cts/.gitignore b/cts/.gitignore
index 6f99c8f..e9e3b0c 100644
--- a/cts/.gitignore
+++ b/cts/.gitignore
@@ -1,2 +1,3 @@
CTSvars.py
*_test_agent
+*.pyc
diff --git a/cts/corosync.py b/cts/corosync.py
index 70dff3c..1df3851 100644
--- a/cts/corosync.py
+++ b/cts/corosync.py
@@ -205,7 +205,7 @@ class corosync_flatiron(ClusterManager):
self.node_to_ip[node] = socket.gethostbyname (node)
return self.node_to_ip[node]
- def StartaCM(self, node):
+ def StartaCM(self, node, verbose=False):
if not self.ShouldBeStatus.has_key(node):
self.ShouldBeStatus[node] = "down"
@@ -238,7 +238,7 @@ class corosync_flatiron(ClusterManager):
return ret
- def StopaCM(self, node):
+ def StopaCM(self, node, verbose=False):
if self.ShouldBeStatus[node] != "up":
return 1
@@ -416,7 +416,7 @@ class TestAgent(object):
self.env.debug('test agent: starting %s on node %s' % (self.binary,
self.node))
self.sock = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
ip = socket.gethostbyname(self.node)
- self.rsh(self.node, self.binary, blocking=0)
+ self.rsh(self.node, self.binary, synchronous=False)
is_connected = False
retries = 0
while not is_connected:
@@ -435,7 +435,7 @@ class TestAgent(object):
'''Tear down (undo) the given ScenarioComponent'''
self.env.debug('test agent: stopping %s on node %s' % (self.binary,
self.node))
self.sock.close ()
- self.rsh(self.node, "killall " + self.binary + " 2>/dev/null")
+ self.rsh(self.node, "killall -9 " + self.binary + " 2>/dev/null")
self.started = False
def kill(self):
diff --git a/cts/corotests.py b/cts/corotests.py
index 514ca3a..0b04a34 100644
--- a/cts/corotests.py
+++ b/cts/corotests.py
@@ -1237,7 +1237,7 @@ confirm watchdog action
self.CM.rsh(node, 'modprobe softdog')
self.CM.StartaCM(node)
- self.CM.rsh(node, ':(){ :|:& };:', blocking=0)
+ self.CM.rsh(node, ':(){ :|:& };:', synchronous=0)
self.CM.log("wait for it to watchdog")
time.sleep(60 * 3)
@@ -1463,7 +1463,7 @@ confirm reboot action
cmd = 'corosync-objctl -w resources.system.memory_used.max=' +
str(mem_new_max)
self.CM.rsh(node, cmd)
- self.CM.rsh(node, 'memhog -r10000 200m', blocking=0)
+ self.CM.rsh(node, 'memhog -r10000 200m', synchronous=0)
self.CM.log("wait for it to reboot")
time.sleep(60 * 3)
--
1.7.3.1
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
