From af4821014aee933327cd230779a6a21ba9537c71 Mon Sep 17 00:00:00 2001 From: Adam King Date: Wed, 5 May 2021 13:40:32 -0400 Subject: [PATCH] mgr/cephadm: add timeout when removing iscsi gateway.conf We already catch TimeoutExpired exceptions here but we don't actually specify a timeout Signed-off-by: Adam King (cherry picked from commit ade46fda791ee2c2e1cac1c2376d56acf7ae4766) --- src/pybind/mgr/cephadm/services/iscsi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py index 7445acfcde97c..82b08a206c98f 100644 --- a/src/pybind/mgr/cephadm/services/iscsi.py +++ b/src/pybind/mgr/cephadm/services/iscsi.py @@ -187,7 +187,8 @@ class IscsiService(CephService): '-n', f'mgr.{self.mgr.get_mgr_id()}', '-p', cast(str, spec.pool), 'rm', - 'gateway.conf']) + 'gateway.conf'], + timeout=5) logger.info(f' removed from {spec.pool}') except subprocess.CalledProcessError as ex: logger.error(f'Error executing <<{ex.cmd}>>: {ex.output}') -- 2.39.5