From: Rishabh Dave <ridave@redhat.com>
Date: Thu, 5 May 2022 14:25:16 +0000 (+0530)
Subject: qa/cephfs: set omit_sudo False when sudo is set to True
X-Git-Tag: v18.0.0~770^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76edd3bb32ba071485f03b121efbab8a87dfeafe;p=ceph.git

qa/cephfs: set omit_sudo False when sudo is set to True

In these methods, parameter "sudo" indicates whether or not sudo is set
to True but the same is not indicated to methods underneath. This value
needs to be passed for the parameter to fulfill it's commitment.

Fixes: https://tracker.ceph.com/issues/55557
Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index c0855bbc1717..1c98d7c3c867 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -693,7 +693,8 @@ class CephFSMount(object):
         if sudo:
             args.append('sudo')
         args += ['adjust-ulimits', 'daemon-helper', 'kill', py_version, '-c', pyscript]
-        return self.client_remote.run(args=args, wait=False, stdin=run.PIPE, stdout=StringIO())
+        return self.client_remote.run(args=args, wait=False, stdin=run.PIPE,
+                                      stdout=StringIO(), omit_sudo=(not sudo))
 
     def run_python(self, pyscript, py_version='python3', sudo=False):
         p = self._run_python(pyscript, py_version, sudo=sudo)
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 7fa426acdf45..4ce36fdff08f 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -683,8 +683,8 @@ class LocalCephFSMount():
         if sudo:
             args.append('sudo')
         args += [py_version, '-c', pyscript]
-        return self.client_remote.run(args=args,
-                                      wait=False, stdout=StringIO())
+        return self.client_remote.run(args=args, wait=False,
+                                      stdout=StringIO(), omit_sudo=(not sudo))
 
     def setup_netns(self):
         if opt_use_ns: