From: John Spray <john.spray@redhat.com>
Date: Thu, 10 Aug 2017 10:10:09 +0000 (+0100)
Subject: mgr/dashboard: fix FS status on old MDS daemons
X-Git-Tag: v12.2.1~49^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17626e01d832bac0068697947f32202d2f8cc13a;p=ceph.git

mgr/dashboard: fix FS status on old MDS daemons

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)
---

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index ea1e8a7e88bd..10b5c37edb30 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -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']