From 1bbac481f3b4658fb7cb2fb1f7ad71e2ae80f65c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 29 Nov 2021 15:51:26 -0500 Subject: [PATCH] mgr/cephadm: avoid repeated calls to get_module_option We already stash these as MgrModule members. Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 3 ++- src/pybind/mgr/cephadm/serve.py | 2 +- src/pybind/mgr/cephadm/services/cephadmservice.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index db7568a3e98..a618e9a6165 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -426,6 +426,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, self.agent_starting_port = 0 self.apply_spec_fails: List[Tuple[str, str]] = [] self.max_osd_draining_count = 10 + self.device_enhanced_scan = False self.notify('mon_map', None) self.config_notify() @@ -2216,7 +2217,7 @@ Then run the following: except Exception: pass deps = sorted([self.get_mgr_ip(), server_port, root_cert, - str(self.get_module_option('device_enhanced_scan'))]) + str(self.device_enhanced_scan)]) elif daemon_type == 'iscsi': deps = [self.get_mgr_ip()] else: diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index e4fd8f91d97..5a93880138d 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -400,7 +400,7 @@ class CephadmServe: return None def _refresh_host_devices(self, host: str) -> Optional[str]: - with_lsm = self.mgr.get_module_option('device_enhanced_scan') + with_lsm = self.mgr.device_enhanced_scan inventory_args = ['--', 'inventory', '--format=json-pretty', '--filter-for-batch'] diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 42e7d55522a..f44dc62b134 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -1035,7 +1035,7 @@ class CephadmAgent(CephService): 'refresh_period': self.mgr.agent_refresh_rate, 'listener_port': self.mgr.agent_starting_port, 'host': daemon_spec.host, - 'device_enhanced_scan': str(self.mgr.get_module_option('device_enhanced_scan'))} + 'device_enhanced_scan': str(self.mgr.device_enhanced_scan)} listener_cert, listener_key = self.mgr.cherrypy_thread.ssl_certs.generate_cert( self.mgr.inventory.get_addr(daemon_spec.host)) -- 2.39.5