From 76edd3bb32ba071485f03b121efbab8a87dfeafe Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 5 May 2022 19:55:16 +0530 Subject: [PATCH] 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 --- qa/tasks/cephfs/mount.py | 3 ++- qa/tasks/vstart_runner.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index c0855bbc171..1c98d7c3c86 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 7fa426acdf4..4ce36fdff08 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: -- 2.39.5