From: Venky Shankar Date: Mon, 7 Mar 2022 05:07:23 +0000 (+0530) Subject: Merge pull request #42098 from joscollin/wip-B50033-rank0-stale-perf-stats X-Git-Tag: v18.0.0~1294 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0c05efaf32471dce7138a43de5fee82678d51c9;p=ceph.git Merge pull request #42098 from joscollin/wip-B50033-rank0-stale-perf-stats mgr/stats: be resilient to offline rank0 MDS Reviewed-by: Venky Shankar --- c0c05efaf32471dce7138a43de5fee82678d51c9 diff --cc src/pybind/mgr/stats/fs/perf_stats.py index 813aee67c5bc8,94ef3924cb2c3..20fd827ca0d23 --- a/src/pybind/mgr/stats/fs/perf_stats.py +++ b/src/pybind/mgr/stats/fs/perf_stats.py @@@ -36,17 -37,12 +37,18 @@@ MDS_PERF_QUERY_COUNTERS_MAP = OrderedDi 'pinned_icaps': 6, 'opened_inodes': 7, 'read_io_sizes': 8, - 'write_io_sizes': 9}) + 'write_io_sizes': 9, + 'avg_read_latency': 10, + 'stdev_read_latency': 11, + 'avg_write_latency': 12, + 'stdev_write_latency': 13, + 'avg_metadata_latency': 14, + 'stdev_metadata_latency': 15}) MDS_PERF_QUERY_COUNTERS = [] # type: List[str] -MDS_GLOBAL_PERF_QUERY_COUNTERS = ['cap_hit', 'read_latency', 'write_latency', 'metadata_latency', 'dentry_lease', 'opened_files', 'pinned_icaps', 'opened_inodes', 'read_io_sizes', 'write_io_sizes'] # type: List[str] +MDS_GLOBAL_PERF_QUERY_COUNTERS = list(MDS_PERF_QUERY_COUNTERS_MAP.keys()) QUERY_EXPIRE_INTERVAL = timedelta(minutes=1) + REREGISTER_TIMER_INTERVAL = 1 CLIENT_METADATA_KEY = "client_metadata" CLIENT_METADATA_SUBKEYS = ["hostname", "root"]