RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-18 16:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr: ceph_pg_* metrics contains last value instead of sum all of them

Browse Source 
During evaluation of pool stats metrics contains last reported value instead of sum

Fixes: https://tracker.ceph.com/issues/44590
Signed-off-by: Jacek Suchenia <jacek.suchenia@gmail.com>
This commit is contained in:
Jacek Suchenia 2020-03-14 14:12:10 +01:00 committed by Kefu Chai
parent e2f3e6062c
commit ad4d790a35
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pybind/mgr/prometheus/module.py
View File

@ -486,13 +486,13 @@ class Module(MgrModule):
ceph_release = host_version[1].split()[-2] # e.g. nautilus
else:
_state = 0
self.metrics['mgr_metadata'].set(1, (
'mgr.{}'.format(mgr), host_version[0],
host_version[1]
))
self.metrics['mgr_status'].set(_state, (
'mgr.{}'.format(mgr),
'mgr.{}'.format(mgr),
))
always_on_modules = mgr_map['always_on_modules'].get(ceph_release, [])
active_modules = list(always_on_modules)
@ -516,30 +516,19 @@ class Module(MgrModule):
pg_summary = self.get('pg_summary')
for pool in pg_summary['by_pool']:
total = 0
num_by_state = dict((state, 0) for state in PG_STATES)
num_by_state['total'] = 0
for state_name, count in pg_summary['by_pool'][pool].items():
reported_states = {}
for state in state_name.split('+'):
reported_states[state] = reported_states.get(
state, 0) + count
num_by_state[state] += count
num_by_state['total'] += count
for state in reported_states:
path = 'pg_{}'.format(state)
try:
self.metrics[path].set(reported_states[state],(pool,))
except KeyError:
self.log.warn("skipping pg in unknown state {}".format(state))
for state in PG_STATES:
if state not in reported_states:
try:
self.metrics['pg_{}'.format(state)].set(0,(pool,))
except KeyError:
self.log.warn(
"skipping pg in unknown state {}".format(state))
total = total + count
self.metrics['pg_total'].set(total,(pool,))
for state, num in num_by_state.items():
try:
self.metrics["pg_{}".format(state)].set(num, (pool,))
except KeyError:
self.log.warn("skipping pg in unknown state {}".format(state))
def get_osd_stats(self):
osd_stats = self.get('osd_stats')