]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
nvmeof: replace obsolete get_tracked_conf_keys()
authorRonen Friedman <rfriedma@redhat.com>
Sun, 9 Mar 2025 15:11:43 +0000 (10:11 -0500)
committerRonen Friedman <rfriedma@redhat.com>
Sun, 9 Mar 2025 17:43:42 +0000 (12:43 -0500)
.. 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/nvmeof/NVMeofGwMonitorClient.cc
src/nvmeof/NVMeofGwMonitorClient.h

index e8024d444a2629d77ce54781e341bd88f8d2f510..a48b85d960520dda886c3baab1cb2956bd516653 100644 (file)
@@ -50,14 +50,6 @@ NVMeofGwMonitorClient::NVMeofGwMonitorClient(int argc, const char **argv) :
 
 NVMeofGwMonitorClient::~NVMeofGwMonitorClient() = default;
 
-const char** NVMeofGwMonitorClient::get_tracked_conf_keys() const
-{
-  static const char* KEYS[] = {
-    NULL
-  };
-  return KEYS;
-}
-
 std::string read_file(const std::string& filename) {
     std::ifstream file(filename);
     std::string content((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
index d18a53512fae7b2c2a8d1b4cd424d6375972a512..dc5fcbce2b2ce45c969545b1f39c8814d906816f 100644 (file)
@@ -80,9 +80,11 @@ public:
   bool ms_handle_refused(Connection *con) override { return false; };
 
   // config observer bits
-  const char** get_tracked_conf_keys() const override;
+  std::vector<std::string> get_tracked_keys() const noexcept override {
+    return {};
+  }
   void handle_conf_change(const ConfigProxy& conf,
-                         const std::set <std::string> &changed) override {};
+                         const std::set<std::string> &changed) override {};
 
   int init();
   void shutdown();