From: Adam King <adking@redhat.com>
Date: Wed, 5 May 2021 17:40:32 +0000 (-0400)
Subject: mgr/cephadm: add timeout when removing iscsi gateway.conf
X-Git-Tag: v17.1.0~2007^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ade46fda791ee2c2e1cac1c2376d56acf7ae4766;p=ceph.git

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 <adking@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py
index 7445acfcde97..82b08a206c98 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'<gateway.conf> removed from {spec.pool}')
             except subprocess.CalledProcessError as ex:
                 logger.error(f'Error executing <<{ex.cmd}>>: {ex.output}')