From 494a1d56cfc7f7608e39a5d04c218e727d20782b Mon Sep 17 00:00:00 2001 From: Melissa Li Date: Tue, 11 Jan 2022 18:03:23 -0500 Subject: [PATCH] mgr/cephadm/iscsi: use `mon_command` in `post_remove` instead of `check_mon_command` Use `mon_command` instead of `check_mon_command` in `post_remove` to avoid errors such as if iscsi service is removed before the iscsi gateway list is updated, cluster will enter error state and iscsi removal gets stuck. Fixes: https://tracker.ceph.com/issues/53706 Signed-off-by: Melissa Li --- src/pybind/mgr/cephadm/services/iscsi.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py index fa54fa053a4f5..d5896f075d497 100644 --- a/src/pybind/mgr/cephadm/services/iscsi.py +++ b/src/pybind/mgr/cephadm/services/iscsi.py @@ -156,17 +156,17 @@ class IscsiService(CephService): """ logger.debug(f'Post remove daemon {self.TYPE}.{daemon.daemon_id}') - if 'dashboard' in self.mgr.get('mgr_map')['modules']: - # remove config for dashboard iscsi gateways - ret, out, err = self.mgr.check_mon_command({ - 'prefix': 'dashboard iscsi-gateway-rm', - 'name': daemon.hostname, - }) + # remove config for dashboard iscsi gateways + ret, out, err = self.mgr.mon_command({ + 'prefix': 'dashboard iscsi-gateway-rm', + 'name': daemon.hostname, + }) + if not ret: logger.info(f'{daemon.hostname} removed from iscsi gateways dashboard config') # needed to know if we have ssl stuff for iscsi in ceph config iscsi_config_dict = {} - ret, iscsi_config, err = self.mgr.check_mon_command({ + ret, iscsi_config, err = self.mgr.mon_command({ 'prefix': 'config-key dump', 'key': 'iscsi', }) @@ -176,7 +176,7 @@ class IscsiService(CephService): # remove iscsi cert and key from ceph config for iscsi_key, value in iscsi_config_dict.items(): if f'iscsi/client.{daemon.name()}/' in iscsi_key: - ret, out, err = self.mgr.check_mon_command({ + ret, out, err = self.mgr.mon_command({ 'prefix': 'config-key rm', 'key': iscsi_key, }) -- 2.39.5