rgw: replace obsolete get_tracked_conf_keys()

... with get_tracked_keys().

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/rgw/rgw_auth.cc b/src/rgw/rgw_auth.cc
index a0b494eb9c5bc6a723c55ccef73c31b132de5007..1c7bf0b73ce9ac29b7a3d28a7adf890cd7b08f55 100644 (file)
--- a/src/rgw/rgw_auth.cc
+++ b/src/rgw/rgw_auth.cc
@@ -886,12 +886,10 @@ void rgw::auth::ImplicitTenants::recompute_value(const ConfigProxy& c)
   saved = v;
 }
 
-const char **rgw::auth::ImplicitTenants::get_tracked_conf_keys() const
+std::vector<std::string> rgw::auth::ImplicitTenants::get_tracked_keys()
+    const noexcept
 {
-  static const char *keys[] = {
-    "rgw_keystone_implicit_tenants",
-  nullptr };
-  return keys;
+  return {"rgw_keystone_implicit_tenants"s};
 }
 
 void rgw::auth::ImplicitTenants::handle_conf_change(const ConfigProxy& c,

diff --git a/src/rgw/rgw_auth.h b/src/rgw/rgw_auth.h
index 22b0816bac9a0a5ef0c0bd00448c39cecf99e707..11a5873ab170da001d4951ad8470929ab4cf9112 100644 (file)
--- a/src/rgw/rgw_auth.h
+++ b/src/rgw/rgw_auth.h
@@ -550,7 +550,7 @@ public:
     return ImplicitTenantValue(saved);
   }
 private:
-  const char** get_tracked_conf_keys() const override;
+  std::vector<std::string> get_tracked_keys() const noexcept override;
   void handle_conf_change(const ConfigProxy& conf,
     const std::set <std::string> &changed) override;
 };

diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
index 28738e9f3ab9199c6b79b22454592338534ba6fa..7b3950d219faf569a6017d628505220046777d26 100644 (file)
--- a/src/rgw/rgw_dmclock_async_scheduler.cc
+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
@@ -5,6 +5,8 @@
 #include "rgw_dmclock_async_scheduler.h"
 #include "rgw_dmclock_scheduler.h"
 
+using namespace std::literals;
+
 namespace rgw::dmclock {
 
 AsyncScheduler::~AsyncScheduler()
@@ -15,15 +17,13 @@ AsyncScheduler::~AsyncScheduler()
   }
 }
 
-const char** AsyncScheduler::get_tracked_conf_keys() const
+std::vector<std::string> AsyncScheduler::get_tracked_keys() const noexcept
 {
   if (observer) {
-    return observer->get_tracked_conf_keys();
+    return observer->get_tracked_keys();
   }
-  static const char* keys[] = { "rgw_max_concurrent_requests", nullptr };
-  return keys;
+  return {"rgw_max_concurrent_requests"s};
 }
-
 void AsyncScheduler::handle_conf_change(const ConfigProxy& conf,
                                         const std::set<std::string>& changed)
 {

diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
index 01ca0a3a8033568eb0ad47f2b9e0626ef1635eaf..d8de05737131c8b430c4c8d2c54db00a3cd6829b 100644 (file)
--- a/src/rgw/rgw_dmclock_async_scheduler.h
+++ b/src/rgw/rgw_dmclock_async_scheduler.h
@@ -64,7 +64,7 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
   /// handler with an operation_aborted error and default-constructed result
   void cancel(const client_id& client);
 
-  const char** get_tracked_conf_keys() const override;
+  std::vector<std::string> get_tracked_keys() const noexcept override;
   void handle_conf_change(const ConfigProxy& conf,
                           const std::set<std::string>& changed) override;
 
@@ -168,9 +168,8 @@ public:
     cct->_conf.add_observer(this);
   }
 
-  const char** get_tracked_conf_keys() const override {
-    static const char* keys[] = { "rgw_max_concurrent_requests", nullptr };
-    return keys;
+  std::vector<std::string> get_tracked_keys() const noexcept override {
+    return {std::string{"rgw_max_concurrent_requests"}};
   }
 
   void handle_conf_change(const ConfigProxy& conf,

diff --git a/src/rgw/rgw_dmclock_scheduler_ctx.cc b/src/rgw/rgw_dmclock_scheduler_ctx.cc
index cc1170eb184a9695f303ab4884309378f74ce2dc..36b36a46a20cabe3992284a8431cd2eeb58dcd88 100644 (file)
--- a/src/rgw/rgw_dmclock_scheduler_ctx.cc
+++ b/src/rgw/rgw_dmclock_scheduler_ctx.cc
@@ -13,6 +13,8 @@
  */
 #include "rgw_dmclock_scheduler_ctx.h"
 
+using namespace std::literals;
+
 namespace rgw::dmclock {
 
 ClientConfig::ClientConfig(CephContext *cct)
@@ -25,25 +27,23 @@ ClientInfo* ClientConfig::operator()(client_id client)
   return &clients[static_cast<size_t>(client)];
 }
 
-const char** ClientConfig::get_tracked_conf_keys() const
+std::vector<std::string> ClientConfig::get_tracked_keys() const noexcept
 {
-  static const char* keys[] = {
-    "rgw_dmclock_admin_res",
-    "rgw_dmclock_admin_wgt",
-    "rgw_dmclock_admin_lim",
-    "rgw_dmclock_auth_res",
-    "rgw_dmclock_auth_wgt",
-    "rgw_dmclock_auth_lim",
-    "rgw_dmclock_data_res",
-    "rgw_dmclock_data_wgt",
-    "rgw_dmclock_data_lim",
-    "rgw_dmclock_metadata_res",
-    "rgw_dmclock_metadata_wgt",
-    "rgw_dmclock_metadata_lim",
-    "rgw_max_concurrent_requests",
-    nullptr
+  return {
+    "rgw_dmclock_admin_res"s,
+    "rgw_dmclock_admin_wgt"s,
+    "rgw_dmclock_admin_lim"s,
+    "rgw_dmclock_auth_res"s,
+    "rgw_dmclock_auth_wgt"s,
+    "rgw_dmclock_auth_lim"s,
+    "rgw_dmclock_data_res"s,
+    "rgw_dmclock_data_wgt"s,
+    "rgw_dmclock_data_lim"s,
+    "rgw_dmclock_metadata_res"s,
+    "rgw_dmclock_metadata_wgt"s,
+    "rgw_dmclock_metadata_lim"s,
+    "rgw_max_concurrent_requests"s
   };
-  return keys;
 }
 
 void ClientConfig::update(const ConfigProxy& conf)

diff --git a/src/rgw/rgw_dmclock_scheduler_ctx.h b/src/rgw/rgw_dmclock_scheduler_ctx.h
index f27b81c266e55f642239ee7b0a20e25b3f72b079..d05596f37bedddfc4c7ade3faa5760c8cb9d2c11 100644 (file)
--- a/src/rgw/rgw_dmclock_scheduler_ctx.h
+++ b/src/rgw/rgw_dmclock_scheduler_ctx.h
@@ -92,7 +92,7 @@ public:
 
   ClientInfo* operator()(client_id client);
 
-  const char** get_tracked_conf_keys() const override;
+  std::vector<std::string> get_tracked_keys() const noexcept override;
   void handle_conf_change(const ConfigProxy& conf,
                           const std::set<std::string>& changed) override;
 };