crimson/osd: replace obsolete get_tracked_conf_keys()

.. with get_tracked_keys().

This PR is but one of a set. 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 <rfriedma@redhat.com>

diff --git a/src/crimson/osd/object_context.cc b/src/crimson/osd/object_context.cc
index d7c0c60bc4e61763051608950529e0b6799a85d7..360572e5b1ab2685fe48999a52427e6f001bf2c6 100644 (file)
--- a/src/crimson/osd/object_context.cc
+++ b/src/crimson/osd/object_context.cc
@@ -8,6 +8,8 @@
 #include "common/Formatter.h"
 #include "crimson/common/config_proxy.h"
 
+using namespace std::string_literals;
+
 namespace {
   seastar::logger& logger() {
     return crimson::get_logger(ceph_subsys_osd);
@@ -28,13 +30,9 @@ ObjectContextRegistry::~ObjectContextRegistry()
   obc_lru.set_target_size(0UL);
 }
 
-const char** ObjectContextRegistry::get_tracked_conf_keys() const
+std::vector<std::string> ObjectContextRegistry::get_tracked_keys() const noexcept
 {
-  static const char* KEYS[] = {
-    "crimson_osd_obc_lru_size",
-    nullptr
-  };
-  return KEYS;
+  return {"crimson_osd_obc_lru_size"s};
 }
 
 void ObjectContextRegistry::handle_conf_change(

diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h
index 56e04ac02d6b1bff5e83b0cd5d5c339d9a7b27c9..f2af71a5a50470c997cb09dc70b06c05bd28e276 100644 (file)
--- a/src/crimson/osd/object_context.h
+++ b/src/crimson/osd/object_context.h
@@ -250,7 +250,7 @@ public:
     obc_lru.for_each(std::forward<F>(f));
   }
 
-  const char** get_tracked_conf_keys() const final;
+  std::vector<std::string> get_tracked_keys() const noexcept final;
   void handle_conf_change(const crimson::common::ConfigProxy& conf,
                           const std::set <std::string> &changed) final;
 };

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 71ec30c1d5bc01d1e3b9682cd6959afb41b6e634..1f4c4603d588dd358d2aac9d1d8ad23d73acd18b 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -76,6 +76,8 @@ using std::vector;
 using crimson::common::local_conf;
 using crimson::os::FuturizedStore;
 
+using namespace std::string_literals;
+
 namespace crimson::osd {
 
 OSD::OSD(int id, uint32_t nonce,
@@ -964,13 +966,9 @@ void OSD::handle_authentication(const EntityName& name,
   }
 }
 
-const char** OSD::get_tracked_conf_keys() const
+std::vector<std::string> OSD::get_tracked_keys() const noexcept
 {
-  static const char* KEYS[] = {
-    "osd_beacon_report_interval",
-    nullptr
-  };
-  return KEYS;
+  return {"osd_beacon_report_interval"s};
 }
 
 void OSD::handle_conf_change(

diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h
index 1cf88bea5d9da6cc867c9fbd7c010c362e21fb9f..27380784d68d7c19f78fc6db84ecbc426abc6d14 100644 (file)
--- a/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@ -131,7 +131,7 @@ class OSD final : public crimson::net::Dispatcher,
   seastar::timer<seastar::lowres_clock> stats_timer;
   std::vector<ShardServices::shard_stats_t> shard_stats;
 
-  const char** get_tracked_conf_keys() const final;
+  std::vector<std::string> get_tracked_keys() const noexcept final;
   void handle_conf_change(const ConfigProxy& conf,
                           const std::set<std::string> &changed) final;
 

diff --git a/src/crimson/osd/osd_operation.cc b/src/crimson/osd/osd_operation.cc
index 0d7ad313865a895c184de92b920c3403eff88a95..66e1e58924c9b5c0c7d31fad395c2ebcd2728983 100644 (file)
--- a/src/crimson/osd/osd_operation.cc
+++ b/src/crimson/osd/osd_operation.cc
@@ -6,6 +6,8 @@
 #include "crimson/common/log.h"
 #include "crimson/osd/osd_operations/client_request.h"
 
+using namespace std::string_literals;
+
 namespace {
   seastar::logger& logger() {
     return crimson::get_logger(ceph_subsys_osd);
@@ -198,13 +200,9 @@ void OperationThrottler::update_from_config(const ConfigProxy &conf)
   wake();
 }
 
-const char** OperationThrottler::get_tracked_conf_keys() const
+std::vector<std::string> OperationThrottler::get_tracked_keys() const noexcept
 {
-  static const char* KEYS[] = {
-    "crimson_osd_scheduler_concurrency",
-    NULL
-  };
-  return KEYS;
+  return {"crimson_osd_scheduler_concurrency"s};
 }
 
 void OperationThrottler::handle_conf_change(

diff --git a/src/crimson/osd/osd_operation.h b/src/crimson/osd/osd_operation.h
index d98f889e438164d1d7ce827f959e838ca0a16497..d702919bd6fae6ca52eceb5086be9399d4751caa 100644 (file)
--- a/src/crimson/osd/osd_operation.h
+++ b/src/crimson/osd/osd_operation.h
@@ -329,7 +329,7 @@ class OperationThrottler : public BlockerT<OperationThrottler>,
 public:
   OperationThrottler(ConfigProxy &conf);
 
-  const char** get_tracked_conf_keys() const final;
+  std::vector<std::string> get_tracked_keys() const noexcept final;
   void handle_conf_change(const ConfigProxy& conf,
                          const std::set<std::string> &changed) final;
   void update_from_config(const ConfigProxy &conf);

diff --git a/src/crimson/osd/scheduler/mclock_scheduler.cc b/src/crimson/osd/scheduler/mclock_scheduler.cc
index 006e4816cd7925003e37e01eabe947f24c8e3a4d..2fcf6d57db47fb01e39534bfb74e1a2165fe66dd 100644 (file)
--- a/src/crimson/osd/scheduler/mclock_scheduler.cc
+++ b/src/crimson/osd/scheduler/mclock_scheduler.cc
@@ -21,6 +21,7 @@
 
 namespace dmc = crimson::dmclock;
 using namespace std::placeholders;
+using namespace std::string_literals;
 
 #define dout_context cct
 #define dout_subsys ceph_subsys_osd
@@ -138,23 +139,22 @@ item_t mClockScheduler::dequeue()
   }
 }
 
-const char** mClockScheduler::get_tracked_conf_keys() const
+std::vector<std::string> mClockScheduler::get_tracked_keys() const noexcept
 {
-  static const char* KEYS[] = {
-    "osd_mclock_scheduler_client_res",
-    "osd_mclock_scheduler_client_wgt",
-    "osd_mclock_scheduler_client_lim",
-    "osd_mclock_scheduler_background_recovery_res",
-    "osd_mclock_scheduler_background_recovery_wgt",
-    "osd_mclock_scheduler_background_recovery_lim",
-    "osd_mclock_scheduler_background_best_effort_res",
-    "osd_mclock_scheduler_background_best_effort_wgt",
-    "osd_mclock_scheduler_background_best_effort_lim",
-    NULL
+  return {
+    "osd_mclock_scheduler_client_res"s,
+    "osd_mclock_scheduler_client_wgt"s,
+    "osd_mclock_scheduler_client_lim"s,
+    "osd_mclock_scheduler_background_recovery_res"s,
+    "osd_mclock_scheduler_background_recovery_wgt"s,
+    "osd_mclock_scheduler_background_recovery_lim"s,
+    "osd_mclock_scheduler_background_best_effort_res"s,
+    "osd_mclock_scheduler_background_best_effort_wgt"s,
+    "osd_mclock_scheduler_background_best_effort_lim"s
   };
-  return KEYS;
 }
 
+
 void mClockScheduler::handle_conf_change(
   const ConfigProxy& conf,
   const std::set<std::string> &changed)

diff --git a/src/crimson/osd/scheduler/mclock_scheduler.h b/src/crimson/osd/scheduler/mclock_scheduler.h
index 153fc758bbd5f7fd50caf4e80b4ee0ab4ffbdca9..16082ffd0954042207d430e5c23ebefea4bf976c 100644 (file)
--- a/src/crimson/osd/scheduler/mclock_scheduler.h
+++ b/src/crimson/osd/scheduler/mclock_scheduler.h
@@ -117,7 +117,8 @@ public:
     ostream << "mClockScheduler";
   }
 
-  const char** get_tracked_conf_keys() const final;
+  std::vector<std::string> get_tracked_keys() const noexcept final;
+
   void handle_conf_change(const ConfigProxy& conf,
                          const std::set<std::string> &changed) final;
 };

diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index e1acb34636f2dcd304d3f9440b9575bdcf65a498..cf78fb3e34d4887c78b1e1aed3e2ec03408667d3 100644 (file)
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -27,6 +27,7 @@
 SET_SUBSYS(osd);
 
 using std::vector;
+using namespace std::string_literals;
 
 namespace crimson::osd {
 
@@ -327,15 +328,13 @@ seastar::future<> OSDSingletonState::send_alive(const epoch_t want)
   }
 }
 
-const char** OSDSingletonState::get_tracked_conf_keys() const
+std::vector<std::string> OSDSingletonState::get_tracked_keys() const noexcept
 {
-  static const char* KEYS[] = {
-    "osd_max_backfills",
-    "osd_min_recovery_priority",
-    "osd_max_trimming_pgs",
-    nullptr
+  return {
+    "osd_max_backfills"s,
+    "osd_min_recovery_priority"s,
+    "osd_max_trimming_pgs"s
   };
-  return KEYS;
 }
 
 void OSDSingletonState::handle_conf_change(

diff --git a/src/crimson/osd/shard_services.h b/src/crimson/osd/shard_services.h
index f1ed9b8d911294368f90d2dc8ce3cc36841432aa..8ea4a8cd0dd5e69881fe5fd053e473d29458f7aa 100644 (file)
--- a/src/crimson/osd/shard_services.h
+++ b/src/crimson/osd/shard_services.h
@@ -318,7 +318,7 @@ private:
   epoch_t up_thru_wanted = 0;
   seastar::future<> send_alive(epoch_t want);
 
-  const char** get_tracked_conf_keys() const final;
+  std::vector<std::string> get_tracked_keys() const noexcept final;
   void handle_conf_change(
     const ConfigProxy& conf,
     const std::set <std::string> &changed) final;