RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

pybind/mgr/status: construct defaultdict without key

Browse Source 
it's simply wrong to construct defaultdict with the key which does not
have the mapped value, what we should do is to specify the
"default_factory" which construct the default value whose key does not
exist in the dict when being accessed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-01-29 12:10:52 +08:00
parent f1ebf6b34d
commit 5ac2901f54
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pybind/mgr/status/module.py
View File

@ -101,8 +101,9 @@ class Module(MgrModule):
if output_format not in ('json', 'json-pretty'): if output_format not in ('json', 'json-pretty'):
activity = "Reqs: " + mgr_util.format_dimless(rate, 5) + "/s" activity = "Reqs: " + mgr_util.format_dimless(rate, 5) + "/s"
defaults = defaultdict(lambda: None, {'version' : 'unknown'}) metadata = self.get_metadata('mds', info['name'],
metadata = self.get_metadata('mds', info['name'], default=defaults) default=defaultdict(lambda: 'unknown'))
assert metadata
mds_versions[metadata['ceph_version']].append(info['name']) mds_versions[metadata['ceph_version']].append(info['name'])
if output_format in ('json', 'json-pretty'): if output_format in ('json', 'json-pretty'):
@ -150,8 +151,9 @@ class Module(MgrModule):
if output_format not in ('json', 'json-pretty'): if output_format not in ('json', 'json-pretty'):
activity = "Evts: " + mgr_util.format_dimless(events, 5) + "/s" activity = "Evts: " + mgr_util.format_dimless(events, 5) + "/s"
defaults = defaultdict(lambda: None, {'version' : 'unknown'}) metadata = self.get_metadata('mds', daemon_info['name'],
metadata = self.get_metadata('mds', daemon_info['name'], default=defaults) default=defaultdict(lambda: 'unknown'))
assert metadata
mds_versions[metadata['ceph_version']].append(daemon_info['name']) mds_versions[metadata['ceph_version']].append(daemon_info['name'])
if output_format in ('json', 'json-pretty'): if output_format in ('json', 'json-pretty'):
@ -224,8 +226,9 @@ class Module(MgrModule):
standby_table.left_padding_width = 0 standby_table.left_padding_width = 0
standby_table.right_padding_width = 2 standby_table.right_padding_width = 2
for standby in fsmap['standbys']: for standby in fsmap['standbys']:
defaults = defaultdict(lambda: None, {'version' : 'unknown'}) metadata = self.get_metadata('mds', standby['name'],
metadata = self.get_metadata('mds', standby['name'], default=defaults) default=defaultdict(lambda: 'unknown'))
assert metadata
mds_versions[metadata['ceph_version']].append(standby['name']) mds_versions[metadata['ceph_version']].append(standby['name'])
if output_format in ('json', 'json-pretty'): if output_format in ('json', 'json-pretty'):
@ -320,9 +323,9 @@ class Module(MgrModule):
kb_avail = 0 kb_avail = 0
if osd_id in osd_stats: if osd_id in osd_stats:
defaults = defaultdict(lambda: None, {'hostname' : ''}) metadata = self.get_metadata('osd', str(osd_id), default=defaultdict(str))
metadata = self.get_metadata('osd', str(osd_id), default=defaults)
stats = osd_stats[osd_id] stats = osd_stats[osd_id]
assert metadata
hostname = metadata['hostname'] hostname = metadata['hostname']
kb_used = stats['kb_used'] * 1024 kb_used = stats['kb_used'] * 1024
kb_avail = stats['kb_avail'] * 1024 kb_avail = stats['kb_avail'] * 1024