From 76bf60b16316ff5e114e0887f995539284815d0e Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 25 Jun 2020 14:36:22 -0600 Subject: [PATCH] mgr/mgr_module: metadata is fetched async fetch metadata using a defaultdict Signed-off-by: Michael Fritch (cherry picked from commit f06e60b591d7921b0afdd40219f3866773b00683) --- src/pybind/mgr/mgr_module.py | 7 +++++-- src/pybind/mgr/status/module.py | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py index 554310d9813..e1bb5ccaf93 100644 --- a/src/pybind/mgr/mgr_module.py +++ b/src/pybind/mgr/mgr_module.py @@ -1053,7 +1053,7 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin): """ return self._ceph_get_server(None) - def get_metadata(self, svc_type, svc_id): + def get_metadata(self, svc_type, svc_id, default=None): """ Fetch the daemon metadata for a particular service. @@ -1066,7 +1066,10 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin): calling this :rtype: dict, or None if no metadata found """ - return self._ceph_get_metadata(svc_type, svc_id) + metadata = self._ceph_get_metadata(svc_type, svc_id) + if metadata is None: + return default + return metadata def get_daemon_status(self, svc_type, svc_id): """ diff --git a/src/pybind/mgr/status/module.py b/src/pybind/mgr/status/module.py index 89646f0acb9..6603343af83 100644 --- a/src/pybind/mgr/status/module.py +++ b/src/pybind/mgr/status/module.py @@ -111,9 +111,10 @@ class Module(MgrModule): if output_format not in ('json', 'json-pretty'): activity = "Reqs: " + mgr_util.format_dimless(rate, 5) + "/s" - metadata = self.get_metadata('mds', info['name']) - version = metadata.get('ceph_version', 'unknown') if metadata else 'unknown' - mds_versions[version].append(info['name']) + defaults = defaultdict(lambda: None, {'version' : 'unknown'}) + metadata = self.get_metadata('mds', info['name'], default=defaults) + mds_versions[metadata['ceph_version']].append(info['name']) + if output_format in ('json', 'json-pretty'): json_output['mdsmap'].append({ 'rank': rank, @@ -153,9 +154,9 @@ class Module(MgrModule): if output_format not in ('json', 'json-pretty'): activity = "Evts: " + mgr_util.format_dimless(events, 5) + "/s" - metadata = self.get_metadata('mds', daemon_info['name']) - version = metadata.get('ceph_version', 'unknown') if metadata else 'unknown' - mds_versions[version].append(daemon_info['name']) + defaults = defaultdict(lambda: None, {'version' : 'unknown'}) + metadata = self.get_metadata('mds', daemon_info['name'], default=defaults) + mds_versions[metadata['ceph_version']].append(daemon_info['name']) if output_format in ('json', 'json-pretty'): json_output['mdsmap'].append({ @@ -223,9 +224,9 @@ class Module(MgrModule): standby_table.left_padding_width = 0 standby_table.right_padding_width = 2 for standby in fsmap['standbys']: - metadata = self.get_metadata('mds', standby['name']) - version = metadata.get('ceph_version', 'unknown') if metadata else 'unknown' - mds_versions[version].append(standby['name']) + defaults = defaultdict(lambda: None, {'version' : 'unknown'}) + metadata = self.get_metadata('mds', standby['name'], default=defaults) + mds_versions[metadata['ceph_version']].append(standby['name']) if output_format in ('json', 'json-pretty'): json_output['mdsmap'].append({ @@ -315,7 +316,8 @@ class Module(MgrModule): kb_avail = 0 if osd_id in osd_stats: - metadata = self.get_metadata('osd', "%s" % osd_id) + defaults = defaultdict(lambda: None, {'hostname' : ''}) + metadata = self.get_metadata('osd', str(osd_id), default=defaults) stats = osd_stats[osd_id] hostname = metadata['hostname'] kb_used = stats['kb_used'] * 1024 -- 2.47.3