RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephfs-top: include additional metrics reported by fs perf stats.

Browse Source 
Without this, `cephfs-top` hits an exception since the additional
metrics keys were not configured.

Also, include a validation suring selftest that checks if `ceph
fs perf stats` metrics match what cephfs-top is configured to
report.

Fixes: http://tracker.ceph.com/issues/49974
Signed-off-by: Venky Shankar <vshankar@redhat.com>
This commit is contained in:
Venky Shankar 2021-03-25 05:40:28 -04:00
parent 8d30d8a67f
commit 5a119dcc13
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/cephfs/top/cephfs-top
View File

@ -59,6 +59,9 @@ MAIN_WINDOW_TOP_LINE_METRICS = OrderedDict([
("WRITE_LATENCY", MetricType.METRIC_TYPE_LATENCY),
("METADATA_LATENCY", MetricType.METRIC_TYPE_LATENCY),
("DENTRY_LEASE", MetricType.METRIC_TYPE_PERCENTAGE),
("OPENED_FILES", MetricType.METRIC_TYPE_NONE),
("PINNED_ICAPS", MetricType.METRIC_TYPE_NONE),
("OPENED_INODES", MetricType.METRIC_TYPE_NONE),
])
MGR_STATS_COUNTERS = list(MAIN_WINDOW_TOP_LINE_METRICS.keys())
@ -135,6 +138,9 @@ class FSTop(object):
stats_json = self.perf_stats_query()
if not stats_json['version'] == FS_TOP_SUPPORTED_VER:
raise FSTopException('perf stats version mismatch!')
missing = [m for m in stats_json["global_counters"] if m.upper() not in MGR_STATS_COUNTERS]
if missing:
raise FSTopException(f'Cannot handle unknown metrics from \'ceph fs perf stats\': {missing}')
def setup_curses(self):
self.stdscr = curses.initscr()
@ -178,6 +184,7 @@ class FSTop(object):
elif typ == MetricType.METRIC_TYPE_LATENCY:
return "(s)"
else:
# return empty string for none type
return ''
def refresh_top_line_and_build_coord(self):
@ -252,6 +259,9 @@ class FSTop(object):
self.mainw.addstr(y_coord, coord[0], f'{calc_perc(m)}')
elif typ == MetricType.METRIC_TYPE_LATENCY:
self.mainw.addstr(y_coord, coord[0], f'{calc_lat(m)}')
else:
# display 0th element from metric tuple
self.mainw.addstr(y_coord, coord[0], f'{m[0]}')
else:
self.mainw.addstr(y_coord, coord[0], "N/A")
cidx += 1