From: Ronen Friedman Date: Tue, 25 Feb 2025 13:40:20 +0000 (-0600) Subject: mon,mgr: replace obsolete get_tracked_conf_keys() X-Git-Tag: testing/wip-vshankar-testing-20250311.100342-debug~14^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2d4b4235fc255fd2a9b114627d9697718795790b;p=ceph-ci.git mon,mgr: replace obsolete get_tracked_conf_keys() .. with get_tracked_keys(). Following https://github.com/ceph/ceph/pull/61394, all uses of the deprecated interface will be updated, and that old interface will be removed. Signed-off-by: Ronen Friedman --- diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index a9427df8b56..f950c01ee72 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -62,6 +62,7 @@ #define dout_prefix *_dout << "mgr.server " << __func__ << " " using namespace TOPNSPC::common; +using namespace std::literals; using std::list; using std::ostream; @@ -3182,15 +3183,12 @@ void DaemonServer::got_mgr_map() daemon_state.cull("mgr", have); } -const char** DaemonServer::get_tracked_conf_keys() const +std::vector DaemonServer::get_tracked_keys() const noexcept { - static const char *KEYS[] = { - "mgr_stats_threshold", - "mgr_stats_period", - nullptr + return { + "mgr_stats_threshold"s, + "mgr_stats_period"s }; - - return KEYS; } void DaemonServer::handle_conf_change(const ConfigProxy& conf, diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h index 7e87aba922f..121fa6ab5ba 100644 --- a/src/mgr/DaemonServer.h +++ b/src/mgr/DaemonServer.h @@ -309,8 +309,8 @@ public: void reregister_mds_perf_queries(); int get_mds_perf_counters(MDSPerfCollector *collector); - virtual const char** get_tracked_conf_keys() const override; - virtual void handle_conf_change(const ConfigProxy& conf, + std::vector get_tracked_keys() const noexcept override; + void handle_conf_change(const ConfigProxy& conf, const std::set &changed) override; void schedule_tick(double delay_sec); diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc index 8795ad7f3a0..ea9e51b0dd1 100644 --- a/src/mgr/MgrStandby.cc +++ b/src/mgr/MgrStandby.cc @@ -40,6 +40,7 @@ using std::map; using std::string; using std::vector; +using namespace std::literals; MgrStandby::MgrStandby(int argc, const char **argv) : Dispatcher(g_ceph_context), @@ -68,23 +69,21 @@ MgrStandby::MgrStandby(int argc, const char **argv) : MgrStandby::~MgrStandby() = default; -const char** MgrStandby::get_tracked_conf_keys() const +std::vector MgrStandby::get_tracked_keys() const noexcept { - static const char* KEYS[] = { + return { // clog & admin clog - "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", - "mgr_standby_modules", - "host", - "fsid", - NULL + "clog_to_monitors"s, + "clog_to_syslog"s, + "clog_to_syslog_facility"s, + "clog_to_syslog_level"s, + "clog_to_graylog"s, + "clog_to_graylog_host"s, + "clog_to_graylog_port"s, + "mgr_standby_modules"s, + "host"s, + "fsid"s }; - return KEYS; } void MgrStandby::handle_conf_change( diff --git a/src/mgr/MgrStandby.h b/src/mgr/MgrStandby.h index ab5a8d05cbf..5c7e2222049 100644 --- a/src/mgr/MgrStandby.h +++ b/src/mgr/MgrStandby.h @@ -34,7 +34,7 @@ class MgrStandby : public Dispatcher, public md_config_obs_t { public: // config observer bits - const char** get_tracked_conf_keys() const override; + std::vector get_tracked_keys() const noexcept override; void handle_conf_change(const ConfigProxy& conf, const std::set &changed) override; diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 654ee4c6910..0f8e1c0716f 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -66,6 +66,7 @@ #define dout_subsys ceph_subsys_mon using namespace TOPNSPC::common; +using namespace std::literals; using std::cerr; using std::cout; @@ -1272,6 +1273,18 @@ void LogMonitor::update_log_channels() log_external_close_fds(); } +std::vector LogMonitor::get_tracked_keys() const noexcept +{ + return { + "mon_cluster_log_to_syslog"s, + "mon_cluster_log_to_syslog_facility"s, + "mon_cluster_log_file"s, + "mon_cluster_log_level"s, + "mon_cluster_log_to_graylog"s, + "mon_cluster_log_to_graylog_host"s, + "mon_cluster_log_to_graylog_port"s, + "mon_cluster_log_to_journald"s + };} void LogMonitor::handle_conf_change(const ConfigProxy& conf, const std::set &changed) diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h index 7afd8cc5c46..ac59db44212 100644 --- a/src/mon/LogMonitor.h +++ b/src/mon/LogMonitor.h @@ -182,20 +182,7 @@ private: g_conf().remove_observer(this); } - const char **get_tracked_conf_keys() const override { - static const char* KEYS[] = { - "mon_cluster_log_to_syslog", - "mon_cluster_log_to_syslog_facility", - "mon_cluster_log_file", - "mon_cluster_log_level", - "mon_cluster_log_to_graylog", - "mon_cluster_log_to_graylog_host", - "mon_cluster_log_to_graylog_port", - "mon_cluster_log_to_journald", - NULL - }; - return KEYS; - } + std::vector get_tracked_keys() const noexcept override; void handle_conf_change(const ConfigProxy& conf, const std::set &changed) override; }; diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index c0454e2689e..ffac9d8946f 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -106,6 +106,7 @@ #undef dout_prefix #define dout_prefix _prefix(_dout, this) using namespace TOPNSPC::common; +using namespace std::literals; using std::cout; using std::dec; @@ -612,44 +613,42 @@ void Monitor::write_features(MonitorDBStore::TransactionRef t) t->put(MONITOR_NAME, COMPAT_SET_LOC, bl); } -const char** Monitor::get_tracked_conf_keys() const +std::vector Monitor::get_tracked_keys() const noexcept { - static const char* KEYS[] = { - "crushtool", // helpful for testing - "mon_election_timeout", - "mon_lease", - "mon_lease_renew_interval_factor", - "mon_lease_ack_timeout_factor", - "mon_accept_timeout_factor", + return { + "crushtool"s, // helpful for testing + "mon_election_timeout"s, + "mon_lease"s, + "mon_lease_renew_interval_factor"s, + "mon_lease_ack_timeout_factor"s, + "mon_accept_timeout_factor"s, // clog & admin clog - "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", - "mon_cluster_log_to_file", - "host", - "fsid", + "clog_to_monitors"s, + "clog_to_syslog"s, + "clog_to_syslog_facility"s, + "clog_to_syslog_level"s, + "clog_to_graylog"s, + "clog_to_graylog_host"s, + "clog_to_graylog_port"s, + "mon_cluster_log_to_file"s, + "host"s, + "fsid"s, // periodic health to clog - "mon_health_to_clog", - "mon_health_to_clog_interval", - "mon_health_to_clog_tick_interval", + "mon_health_to_clog"s, + "mon_health_to_clog_interval"s, + "mon_health_to_clog_tick_interval"s, // scrub interval - "mon_scrub_interval", - "mon_allow_pool_delete", + "mon_scrub_interval"s, + "mon_allow_pool_delete"s, // osdmap pruning - observed, not handled. - "mon_osdmap_full_prune_enabled", - "mon_osdmap_full_prune_min", - "mon_osdmap_full_prune_interval", - "mon_osdmap_full_prune_txsize", + "mon_osdmap_full_prune_enabled"s, + "mon_osdmap_full_prune_min"s, + "mon_osdmap_full_prune_interval"s, + "mon_osdmap_full_prune_txsize"s, // debug options - observed, not handled - "mon_debug_extra_checks", - "mon_debug_block_osdmap_trim", - NULL + "mon_debug_extra_checks"s, + "mon_debug_block_osdmap_trim"s }; - return KEYS; } void Monitor::handle_conf_change(const ConfigProxy& conf, diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 17ffd6ae3b1..016d53ed23d 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -1054,7 +1054,7 @@ private: static int check_features(MonitorDBStore *store); // config observer - const char** get_tracked_conf_keys() const override; + std::vector get_tracked_keys() const noexcept override; void handle_conf_change(const ConfigProxy& conf, const std::set &changed) override; diff --git a/src/mon/NVMeofGwMon.cc b/src/mon/NVMeofGwMon.cc index ccda0eeca62..adebbc99e67 100644 --- a/src/mon/NVMeofGwMon.cc +++ b/src/mon/NVMeofGwMon.cc @@ -143,14 +143,6 @@ void NVMeofGwMon::tick() } } -const char **NVMeofGwMon::get_tracked_conf_keys() const -{ - static const char* KEYS[] = { - NULL - }; - return KEYS; -} - version_t NVMeofGwMon::get_trim_to() const { // we don't actually need *any* old states, but keep a few. diff --git a/src/mon/NVMeofGwMon.h b/src/mon/NVMeofGwMon.h index 8cde2af54b1..7485505dc64 100644 --- a/src/mon/NVMeofGwMon.h +++ b/src/mon/NVMeofGwMon.h @@ -49,7 +49,9 @@ public: ~NVMeofGwMon() override {} // config observer - const char** get_tracked_conf_keys() const override; + std::vector get_tracked_keys() const noexcept override { + return {}; + } void handle_conf_change( const ConfigProxy& conf, const std::set &changed) override {}; diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 3cff87879f7..a312682db9a 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -111,6 +111,7 @@ using ceph::ErasureCodeProfile; using ceph::Formatter; using ceph::JSONFormatter; using ceph::make_message; +using namespace std::literals; #define dout_subsys ceph_subsys_mon static const string OSD_PG_CREATING_PREFIX("osd_pg_creating"); @@ -481,15 +482,13 @@ OSDMonitor::OSDMonitor( } } -const char **OSDMonitor::get_tracked_conf_keys() const +std::vector OSDMonitor::get_tracked_keys() const noexcept { - static const char* KEYS[] = { - "mon_memory_target", - "mon_memory_autotune", - "rocksdb_cache_size", - NULL + return { + "mon_memory_target"s, + "mon_memory_autotune"s, + "rocksdb_cache_size"s }; - return KEYS; } void OSDMonitor::handle_conf_change(const ConfigProxy& conf, diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index c82373c634d..4d1172932de 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -213,7 +213,7 @@ public: OSDMap osdmap; // config observer - const char** get_tracked_conf_keys() const override; + std::vector get_tracked_keys() const noexcept override; void handle_conf_change(const ConfigProxy& conf, const std::set &changed) override; // [leader]