From 0cbac2f856058b2027bd22a69c44b8126664cb18 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 2 Aug 2019 13:17:25 -0700 Subject: [PATCH] mds: alphabetize tracked config keys Signed-off-by: Patrick Donnelly --- src/mds/MDSRank.cc | 49 ++++++++++++++++++++++------------------------ src/mds/MDSRank.h | 2 +- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 46b741439c6..e5a0d4d08bd 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -3658,43 +3658,40 @@ epoch_t MDSRank::get_osd_epoch() const const char** MDSRankDispatcher::get_tracked_conf_keys() const { static const char* KEYS[] = { - "mds_op_complaint_time", "mds_op_log_threshold", - "mds_op_history_size", "mds_op_history_duration", - "mds_enable_op_tracker", - "mds_log_pause", - // clog & admin clog + "clog_to_graylog", + "clog_to_graylog_host", + "clog_to_graylog_port", "clog_to_monitors", "clog_to_syslog", "clog_to_syslog_facility", "clog_to_syslog_level", - "clog_to_graylog", - "clog_to_graylog_host", - "clog_to_graylog_port", - // MDCache - "mds_cache_size", + "fsid", + "host", + "mds_bal_fragment_dirs", + "mds_bal_fragment_interval", "mds_cache_memory_limit", - "mds_cache_reservation", - "mds_health_cache_threshold", "mds_cache_mid", - "mds_dump_cache_threshold_formatter", + "mds_cache_reservation", + "mds_cache_size", "mds_cache_trim_decay_rate", + "mds_cap_revoke_eviction_timeout", "mds_dump_cache_threshold_file", - // MDBalancer - "mds_bal_fragment_dirs", - "mds_bal_fragment_interval", - // PurgeQueue + "mds_dump_cache_threshold_formatter", + "mds_enable_op_tracker", + "mds_health_cache_threshold", + "mds_inject_migrator_session_race", + "mds_log_pause", + "mds_max_export_size", + "mds_max_purge_files", "mds_max_purge_ops", "mds_max_purge_ops_per_pg", - "mds_max_purge_files", - // Migrator - "mds_max_export_size", - "mds_inject_migrator_session_race", - "host", - "fsid", - "mds_cap_revoke_eviction_timeout", - // SessionMap - "mds_request_load_average_decay_rate", + "mds_op_complaint_time", + "mds_op_history_duration", + "mds_op_history_size", + "mds_op_log_threshold", "mds_recall_max_decay_rate", + "mds_recall_warning_decay_rate", + "mds_request_load_average_decay_rate", NULL }; return KEYS; diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h index eff0d872303..4a708894cdd 100644 --- a/src/mds/MDSRank.h +++ b/src/mds/MDSRank.h @@ -633,7 +633,7 @@ public: void handle_osd_map(); void update_log_config(); - const char** get_tracked_conf_keys() const final; + const char** get_tracked_conf_keys() const override final; void handle_conf_change(const ConfigProxy& conf, const std::set& changed) override; bool handle_command( -- 2.39.5