From: Xiubo Li Date: Thu, 5 Mar 2020 10:31:14 +0000 (-0500) Subject: qa/vstart_runner: fix mutiple 'timeout' option conflicting X-Git-Tag: v16.1.0~2763^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bcd319496f507f76864a972c1de63439dd78d4a;p=ceph.git qa/vstart_runner: fix mutiple 'timeout' option conflicting The 'timeout' option in the environment may will conflict with the ones in some ceph commands, like: $ timeout 120 ./bin/ceph daemon mds.b session config 8718 timeout 45 And the old code will also give us incorrect result like: ['adjust-ulimits', 'ceph-coverage', 'timeout', '120', 'ceph', 'fs', 'dump'] will be transfered to: ['adjust-ulimits', 'ceph-coverage', '120', 'ceph', 'fs', 'dump'] The '120' is left behind. Fixes: https://tracker.ceph.com/issues/44437 Signed-off-by: Xiubo Li --- diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index ccc706b922b6..c673bfd0acb5 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -333,7 +333,7 @@ class LocalRemote(object): # Filter out helper tools that don't exist in a vstart environment args = [a for a in args if a not in { - 'adjust-ulimits', 'ceph-coverage', 'timeout'}] + 'adjust-ulimits', 'ceph-coverage'}] # Adjust binary path prefix if given a bare program name if "/" not in args[0]: