From 8e9b08ec7f8b20a3dbdef4e05c1d9620886f5e5f Mon Sep 17 00:00:00 2001
From: Ronen Friedman <rfriedma@redhat.com>
Date: Sun, 9 Mar 2025 12:35:06 -0500
Subject: [PATCH] librbd/ConfigWatcher: 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 <rfriedma@redhat.com>
---
 src/librbd/ConfigWatcher.cc | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/librbd/ConfigWatcher.cc b/src/librbd/ConfigWatcher.cc
index 6c13cbf4c75..48a8db6d76e 100644
--- a/src/librbd/ConfigWatcher.cc
+++ b/src/librbd/ConfigWatcher.cc
@@ -26,36 +26,28 @@ template <typename I>
 struct ConfigWatcher<I>::Observer : public md_config_obs_t {
   ConfigWatcher<I>* m_config_watcher;
 
-  std::deque<std::string> m_config_key_strs;
-  mutable std::vector<const char*> m_config_keys;
+  std::vector<std::string> m_config_key_strs;
 
   Observer(CephContext* cct, ConfigWatcher<I>* config_watcher)
     : m_config_watcher(config_watcher) {
-    const std::string rbd_key_prefix("rbd_");
+    static const std::string rbd_key_prefix("rbd_");
     auto& schema = cct->_conf.get_schema();
     for (auto& pair : schema) {
       // watch all "rbd_" keys for simplicity
-      if (!boost::starts_with(pair.first, rbd_key_prefix)) {
+      if (!pair.first.starts_with(rbd_key_prefix)) {
         continue;
       }
 
       m_config_key_strs.emplace_back(pair.first);
     }
-
-    m_config_keys.reserve(m_config_key_strs.size());
-    for (auto& key : m_config_key_strs) {
-      m_config_keys.emplace_back(key.c_str());
-    }
-    m_config_keys.emplace_back(nullptr);
   }
 
-  const char** get_tracked_conf_keys() const override {
-    ceph_assert(!m_config_keys.empty());
-    return &m_config_keys[0];
+  std::vector<std::string> get_tracked_keys() const noexcept {
+    return m_config_key_strs;
   }
 
   void handle_conf_change(const ConfigProxy& conf,
-                          const std::set <std::string> &changed) override {
+                          const std::set<std::string> &changed) override {
     m_config_watcher->handle_global_config_change(changed);
   }
 };
-- 
2.39.5