Signed-off-by: Angus Salkeld <[email protected]>
---
cts/corosync.py | 1 +
cts/corotests.py | 7 ++-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cts/corosync.py b/cts/corosync.py
index 1eb2716..18691c1 100644
--- a/cts/corosync.py
+++ b/cts/corosync.py
@@ -437,6 +437,7 @@ class TestAgent(object):
self.env.debug('test agent: stopping %s on node %s' % (self.binary,
self.node))
self.rsh(self.node, "killall " + self.binary + " 2>/dev/null")
self.sock.close ()
+ 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 c956611..36953f1 100644
--- a/cts/corotests.py
+++ b/cts/corotests.py
@@ -1106,14 +1106,14 @@ class GenStopAllBeekhof(CoroTest):
self.CM.cpg_agent[n].pcmk_test()
for n in self.CM.Env["nodes"]:
- self.CM.cpg_agent[n].msg_blaster(10000)
+ self.CM.cpg_agent[n].msg_blaster(1000)
for n in self.CM.Env["nodes"]:
self.CM.cpg_agent[n].cfg_shutdown()
self.CM.ShouldBeStatus[n] = "down"
waited = 0
- max_wait = 60
+ max_wait = 90
still_up = list(self.CM.Env["nodes"])
while len(still_up) > 0:
@@ -1130,9 +1130,6 @@ class GenStopAllBeekhof(CoroTest):
waited = int(time.time()) - stopping
if waited > max_wait:
- for v in still_up:
- self.CM.log("%s killing corosync on %s" % (self.name, v))
- self.CM.rsh(v, 'killall -SIGSEGV corosync cpg_test_agent')
return self.failure("Waited %d secs for nodes: %s to stop" %
(waited, str(still_up)))
self.CM.log("%s ALL good (waited %d secs)" % (self.name,
waited))
--
1.7.3.1
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
