From dbf1a402c9626bcb2d1b3363f871c569860a0921 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 17 Jan 2023 21:21:08 -0500 Subject: [PATCH] qa/tasks: allow specifying timeout command prefix to ceph Signed-off-by: Patrick Donnelly --- qa/tasks/ceph_manager.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py index 8db8bda6086..135c40521c9 100644 --- a/qa/tasks/ceph_manager.py +++ b/qa/tasks/ceph_manager.py @@ -1564,19 +1564,28 @@ class CephManager: elif isinstance(kwargs['args'], tuple): kwargs['args'] = list(kwargs['args']) + prefixcmd = [] + timeoutcmd = kwargs.pop('timeoutcmd', None) + if timeoutcmd is not None: + prefixcmd += ['timeout', str(timeoutcmd)] + if self.cephadm: + prefixcmd += ['ceph'] + cmd = prefixcmd + list(kwargs['args']) return shell(self.ctx, self.cluster, self.controller, - args=['ceph'] + list(kwargs['args']), + args=cmd, stdout=StringIO(), check_status=kwargs.get('check_status', True)) - if self.rook: + elif self.rook: + prefixcmd += ['ceph'] + cmd = prefixcmd + list(kwargs['args']) return toolbox(self.ctx, self.cluster, - args=['ceph'] + list(kwargs['args']), + args=cmd, stdout=StringIO(), check_status=kwargs.get('check_status', True)) - - kwargs['args'] = self.CEPH_CMD + kwargs['args'] - return self.controller.run(**kwargs) + else: + kwargs['args'] = prefixcmd + self.CEPH_CMD + kwargs['args'] + return self.controller.run(**kwargs) def raw_cluster_cmd(self, *args, **kwargs) -> str: """ -- 2.39.5