From d6a0b3163f39dd227700ad645b25bd15ab9ed736 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 25 Oct 2019 19:20:05 -0500 Subject: [PATCH] qa/tasks/cbt: run stop-all.sh when finishing up stop-all.sh will work if the right deps are there (currently we lack 'nc') also killall -9 java to be sure. Fixes: https://tracker.ceph.com/issues/42496 Signed-off-by: Sage Weil (cherry picked from commit 56e99ba5f03dd8e6d6d62117ff945798fdbe1e10) --- qa/tasks/cbt.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py index ae2ae40f992b1..cef236cf26ed8 100644 --- a/qa/tasks/cbt.py +++ b/qa/tasks/cbt.py @@ -240,6 +240,21 @@ class CBT(Task): cosbench_version = 'cosbench-0.4.2.c3.1' else: cosbench_version = '0.4.2.c3' + # note: stop-all requires 'nc' + self.first_mon.run( + args=[ + 'cd', testdir, run.Raw('&&'), + 'cd', 'cos', run.Raw('&&'), + 'sh', 'stop-all.sh', + run.Raw('||'), 'true' + ] + ) + self.first_mon.run( + args=[ + 'sudo', 'killall', '-9', 'java', + run.Raw('||'), 'true' + ] + ) self.first_mon.run( args=[ 'rm', '--one-file-system', '-rf', '--', -- 2.39.5