Skip to content

Commit e36f4eb

Browse files
authored
Merge pull request #64 from teicee/ceph-15
Ceph 15.2.5
2 parents 57b9c81 + b9054aa commit e36f4eb

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

app/dashboard/views.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@ def get(self):
114114
if 'err' in cluster_status:
115115
abort(500, cluster_status['err'])
116116

117+
# ceph >= 15.2.5
118+
if 'osdmap' not in cluster_status['osdmap']:
119+
# osdmap has been converted to depth-1 dict
120+
cluster_status['osdmap']['osdmap'] = cluster_status['osdmap'].copy()
121+
monitor_status = CephClusterCommand(cluster, prefix='quorum_status', format='json')
122+
cluster_status['monmap'] = monitor_status['monmap']
123+
124+
117125
# check for unhealthy osds and get additional osd infos from cluster
118126
total_osds = cluster_status['osdmap']['osdmap']['num_osds']
119127
in_osds = cluster_status['osdmap']['osdmap']['num_up_osds']

0 commit comments

Comments
 (0)