From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 21 Oct 2022 17:20:16 +0000 (+0800)
Subject: qa/tasks/vstart_runner: do not fail if stop.sh fails
X-Git-Tag: v18.1.0~964^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48588%2Fhead;p=ceph.git

qa/tasks/vstart_runner: do not fail if stop.sh fails

stop.sh might fail, but let's keep moving on.

See-also: https://tracker.ceph.com/issues/57834
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 1a8902079ae4..8601eeee03b2 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -1069,7 +1069,10 @@ class LogRotate():
 
 def teardown_cluster():
     log.info('\ntearing down the cluster...')
-    remote.run(args=[os.path.join(SRC_PREFIX, "stop.sh")], timeout=60)
+    try:
+        remote.run(args=[os.path.join(SRC_PREFIX, "stop.sh")], timeout=60)
+    except CommandFailedError as e:
+        log.error('stop.sh failed: %s', e)
     log.info('\nceph cluster torn down')
     remote.run(args=['rm', '-rf', './dev', './out'])