From: Patrick Seidensal <pseidensal@suse.com>
Date: Thu, 7 Nov 2019 15:57:26 +0000 (+0000)
Subject: mgr/dashboard: KeyError on dashboard reload
X-Git-Tag: v14.2.8~20^2~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04cc5982d81ff19eab94b3b526a666ceff8ba0df;p=ceph.git

mgr/dashboard: KeyError on dashboard reload

When reloading the dashboard using `ceph mgr module disable/enable
dashbaord`, the error is thrown shortly after the dashboard module has
been reactivated, because `dashboard` is not yet available in
`services`. A second attempt works.

Fixes: https://tracker.ceph.com/issues/42684

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 808f0bf5e0adf4abda192758edbccdee3d4113d2)
---

diff --git a/src/pybind/mgr/dashboard/controllers/summary.py b/src/pybind/mgr/dashboard/controllers/summary.py
index 0b2d51e52747..09d69ecfb027 100644
--- a/src/pybind/mgr/dashboard/controllers/summary.py
+++ b/src/pybind/mgr/dashboard/controllers/summary.py
@@ -63,9 +63,9 @@ class Summary(BaseController):
         return result
 
     def _get_host(self):
-        mgr_map = mgr.get('mgr_map')
-        services = mgr_map['services']
-        return services['dashboard']
+        # type: () -> str
+        services = mgr.get('mgr_map')['services']
+        return services['dashboard'] if 'dashboard' in services else ''
 
     @Endpoint()
     def __call__(self):