From d28f2a29a720b522dbfdbafee7391281b699b4d7 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 17 May 2022 16:30:45 +0530 Subject: [PATCH] qa/cephfs/mount: set omit_sudo when sudo is present in args Methods run_as_user() and run_python() don't set omit_sudo to False even when command arguments contain sudo. This will cause vstart_runner.py to delete "sudo" from command arguments which will/might lead to a bug. Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/mount.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 9e53c983abc..706a60f5fd2 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -693,12 +693,13 @@ class CephFSMount(object): ]) def _run_python(self, pyscript, py_version='python3', sudo=False): - args = [] + args, omit_sudo = [], True if sudo: args.append('sudo') + omit_sudo = False args += ['adjust-ulimits', 'daemon-helper', 'kill', py_version, '-c', pyscript] return self.client_remote.run(args=args, wait=False, stdin=run.PIPE, - stdout=StringIO(), omit_sudo=(not sudo)) + stdout=StringIO(), omit_sudo=omit_sudo) def run_python(self, pyscript, py_version='python3', sudo=False): p = self._run_python(pyscript, py_version, sudo=sudo) @@ -745,6 +746,7 @@ class CephFSMount(object): args = ['sudo', '-u', user, '-s', '/bin/bash', '-c', cmd] kwargs['args'] = args + kwargs['omit_sudo'] = False return self.run_shell(**kwargs) def run_as_root(self, **kwargs): -- 2.47.3