From: Sage Weil <sage@redhat.com>
Date: Sat, 26 Oct 2019 00:20:05 +0000 (-0500)
Subject: qa/tasks/cbt: run stop-all.sh when finishing up
X-Git-Tag: v14.2.5~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bee7ad84a81d79831190355259a1895725b0e8fc;p=ceph.git

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 <sage@redhat.com>
(cherry picked from commit 56e99ba5f03dd8e6d6d62117ff945798fdbe1e10)
---

diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py
index 9f8520f8cc5..b774cb56699 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', '--',