From: Rishabh Dave <ridave@redhat.com>
Date: Sat, 25 Sep 2021 09:29:27 +0000 (+0530)
Subject: qa/vstart_runner: get rid of "exec sudo" from "ceph -w" cmd args
X-Git-Tag: v18.0.0~956^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=43b170ab187406ae477fbf25e0660c3fc07bb12a;p=ceph.git

qa/vstart_runner: get rid of "exec sudo" from "ceph -w" cmd args

Passing "exec sudo" to "ceph -w" caused "Ceph API test" CI job to fail.
Error was not related to this tracker issue but the code added for it
is reversed now in this commit. The tracker issue -
https://tracker.ceph.com/issues/49644.

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

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 6d6252e4ad9a1..2fa8bbe6be358 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -804,18 +804,7 @@ class LocalCephManager(CephManager):
         self.cephadm = False
         self.rook = False
         self.testdir = None
-        self.run_cluster_cmd_prefix = [CEPH_CMD]
-        # XXX: Ceph API test CI job crashes because "ceph -w" process launched
-        # by run_ceph_w() crashes when shell is set to True.
-        # See https://tracker.ceph.com/issues/49644.
-        #
-        # The 2 possible workaround this are either setting "shell" to "False"
-        # when command "ceph -w" is executed or to prepend "exec sudo" to
-        # command arguments. We are going with latter since former would make
-        # it necessary to pass "shell" parameter to run() method. This leads
-        # to incompatibility with the method teuthology.orchestra.run's run()
-        # since it doesn't accept "shell" as parameter.
-        self.run_ceph_w_prefix = ['exec', 'sudo', CEPH_CMD]
+        self.run_ceph_w_prefix = self.run_cluster_cmd_prefix = [CEPH_CMD]
 
     def find_remote(self, daemon_type, daemon_id):
         """