RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr_module: Deal with long running avgs properly

Browse Source 
We have recently started exposing long running avgs with the mgr python
modules but that only covers the total sum, not the avgcount.

With this patch, the counts for long running avgs are exposed to the
python modules allowing them to deal with the new data.

Signed-off-by: Boris Ranto <branto@redhat.com>
This commit is contained in:
Boris Ranto 2018-05-15 11:05:22 +02:00
parent 1164ef2f32
commit f79ff11302
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pybind/mgr/mgr_module.py
View File

@ -692,6 +692,13 @@ class MgrModule(ceph_module.BaseMgrModule):
else:
return 0
def get_latest_avg(self, daemon_type, daemon_name, counter):
data = self.get_counter(daemon_type, daemon_name, counter)[counter]
if data:
return (data[-1][1], data[-1][2])
else:
return (0, 0)
def get_all_perf_counters(self, prio_limit=PRIO_USEFUL):
"""
Return the perf counters currently known to this ceph-mgr
@ -733,9 +740,24 @@ class MgrModule(ceph_module.BaseMgrModule):
if counter_schema['priority'] < prio_limit:
continue
counter_info = counter_schema
counter_info['value'] = self.get_latest(service['type'], service['id'],
counter_path)
counter_info = dict(counter_schema)
# Also populate count for the long running avgs
if counter_schema['type'] & self.PERFCOUNTER_LONGRUNAVG:
v, c = self.get_latest_avg(
service['type'],
service['id'],
counter_path
)
counter_info['value'], counter_info['count'] = v, c
result[svc_full_name][counter_path] = counter_info
else:
counter_info['value'] = self.get_latest(
service['type'],
service['id'],
counter_path
)
result[svc_full_name][counter_path] = counter_info
self.log.debug("returning {0} counter".format(len(result)))