]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/fsstatus: cope with missing 'ceph_version' 14129/head
authorTim Serong <tserong@suse.com>
Fri, 24 Mar 2017 15:50:05 +0000 (16:50 +0100)
committerTim Serong <tserong@suse.com>
Fri, 24 Mar 2017 15:52:36 +0000 (16:52 +0100)
The fsstats module assumes ceph_version always exists in daemon
metadata, but it actually might not if run against older daemons
(see previous commit).  As the version here is actually being
presented to the user, I've set it to "unknown" in the missing
case, rather than an empty string.

Signed-off-by: Tim Serong <tserong@suse.com>
src/pybind/mgr/fsstatus/module.py

index f137a5466b0b7f2229917dd4682c519ea24bb55a..0db7ee750ddccf98bc8b01821f7631248188c171 100644 (file)
@@ -156,7 +156,7 @@ class Module(MgrModule):
                         ) + "/s"
 
                     metadata = self.get_metadata('mds', info['name'])
-                    mds_versions[metadata['ceph_version']].append(info['name'])
+                    mds_versions[metadata.get('ceph_version', "unknown")].append(info['name'])
                     rank_table.add_row([
                         self.bold(rank.__str__()), c_state, info['name'],
                         activity,
@@ -215,7 +215,7 @@ class Module(MgrModule):
         standby_table = PrettyTable(["Standby MDS"])
         for standby in fsmap['standbys']:
             metadata = self.get_metadata('mds', standby['name'])
-            mds_versions[metadata['ceph_version']].append(standby['name'])
+            mds_versions[metadata.get('ceph_version', "unknown")].append(standby['name'])
 
             standby_table.add_row([standby['name']])