From bb2ac3222fc87b1188f8f8a8a6cbe525257d317c Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Sun, 9 Mar 2025 10:11:43 -0500 Subject: [PATCH] nvmeof: 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 --- src/nvmeof/NVMeofGwMonitorClient.cc | 8 -------- src/nvmeof/NVMeofGwMonitorClient.h | 6 ++++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/nvmeof/NVMeofGwMonitorClient.cc b/src/nvmeof/NVMeofGwMonitorClient.cc index e8024d444a2..a48b85d9605 100644 --- a/src/nvmeof/NVMeofGwMonitorClient.cc +++ b/src/nvmeof/NVMeofGwMonitorClient.cc @@ -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(file)), std::istreambuf_iterator()); diff --git a/src/nvmeof/NVMeofGwMonitorClient.h b/src/nvmeof/NVMeofGwMonitorClient.h index d18a53512fa..dc5fcbce2b2 100644 --- a/src/nvmeof/NVMeofGwMonitorClient.h +++ b/src/nvmeof/NVMeofGwMonitorClient.h @@ -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 get_tracked_keys() const noexcept override { + return {}; + } void handle_conf_change(const ConfigProxy& conf, - const std::set &changed) override {}; + const std::set &changed) override {}; int init(); void shutdown(); -- 2.39.5