]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: fix FS status on old MDS daemons 17477/head
authorJohn Spray <john.spray@redhat.com>
Thu, 10 Aug 2017 10:10:09 +0000 (11:10 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 5 Sep 2017 09:45:22 +0000 (11:45 +0200)
These may not have the version string.  We already handled
this in the equivalent code in the status module, so just
do the same thing in dashboard.

Fixes: http://tracker.ceph.com/issues/20692
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 800662c2fa3f040992987dc5c635dfbc14f0a0ea)

src/pybind/mgr/dashboard/module.py

index ea1e8a7e88bd0c6103468989d4c40f28b60a3da8..10b5c37edb30794d3ef363b31e80485b90dfd50e 100644 (file)
@@ -294,7 +294,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.append(
                     {
                         "rank": rank,
@@ -363,7 +363,7 @@ class Module(MgrModule):
         standby_table = []
         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.append({
                 'name': standby['name']