From 59397b3c0c98b44c552d8751e7c82187ba1dfa6b Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Thu, 9 Dec 2010 17:03:13 +1100 Subject: [PATCH] CTS: get GenStopAllBeekhof working a bit better Reviewed-by: Steven Dake Signed-off-by: Angus Salkeld --- cts/corosync.py | 1 + cts/corotests.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cts/corosync.py b/cts/corosync.py index 86a86b16..b7710484 100644 --- a/cts/corosync.py +++ b/cts/corosync.py @@ -440,6 +440,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 3bb78729..8ac35149 100644 --- a/cts/corotests.py +++ b/cts/corotests.py @@ -1123,7 +1123,7 @@ 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() @@ -1147,9 +1147,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))