]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #42098 from joscollin/wip-B50033-rank0-stale-perf-stats wip-jsalomon-prim-balance-score
authorVenky Shankar <vshankar@redhat.com>
Mon, 7 Mar 2022 05:07:23 +0000 (10:37 +0530)
committerGitHub <noreply@github.com>
Mon, 7 Mar 2022 05:07:23 +0000 (10:37 +0530)
mgr/stats: be resilient to offline rank0 MDS

Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
src/mgr/BaseMgrModule.cc
src/mgr/MDSPerfMetricTypes.h
src/pybind/mgr/mgr_module.py
src/pybind/mgr/stats/fs/perf_stats.py

Simple merge
Simple merge
Simple merge
index 813aee67c5bc86a839124db925d31fada9a45f01,94ef3924cb2c31a93bca6fd618b32b6919d84f61..20fd827ca0d230a11ad80c9ba1bcb8225d8869eb
@@@ -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"]