From: Rishabh Dave <ridave@redhat.com>
Date: Fri, 18 Sep 2020 11:03:41 +0000 (+0530)
Subject: qa/mgr: revert a patch from commit 04ed58f
X-Git-Tag: v16.1.0~1023^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f07ccd64d477b9d5c0e94246121aa463ecbf75d6;p=ceph.git

qa/mgr: revert a patch from commit 04ed58f

mds_cluster.mds_fail() runs command "mds fail" not "fs fail". The reason
for failure was PR #32581 which accidentally changed the return code
from 0 to EINVAL. Since this was reversed in PR #37159, the change
introduced by 04ed58f is not only incorrect but also redundant.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py
index ea4268da8469e..d65f23b04110c 100644
--- a/qa/tasks/mgr/dashboard/helper.py
+++ b/qa/tasks/mgr/dashboard/helper.py
@@ -155,6 +155,8 @@ class DashboardTestCase(MgrTestCase):
 
             # To avoid any issues with e.g. unlink bugs, we destroy and recreate
             # the filesystem rather than just doing a rm -rf of files
+            cls.mds_cluster.mds_stop()
+            cls.mds_cluster.mds_fail()
             cls.mds_cluster.delete_all_filesystems()
             cls.fs = None  # is now invalid!