From 170c5a4395a2f503a9076a0ffa1768fbd04e6e1b Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 2 May 2024 15:01:22 -0400 Subject: [PATCH] rgw/notify: remove Manager-specific overloads Signed-off-by: Casey Bodley (cherry picked from commit 6f74455e62b7eb232199871174018ec441b254b0) --- src/rgw/driver/rados/rgw_notify.cc | 14 -------------- src/rgw/driver/rados/rgw_notify.h | 6 ------ 2 files changed, 20 deletions(-) diff --git a/src/rgw/driver/rados/rgw_notify.cc b/src/rgw/driver/rados/rgw_notify.cc index cdbbd63de474d..7d392ccc863ac 100644 --- a/src/rgw/driver/rados/rgw_notify.cc +++ b/src/rgw/driver/rados/rgw_notify.cc @@ -829,13 +829,6 @@ int add_persistent_topic(const DoutPrefixProvider* dpp, librados::IoCtx& rados_i return 0; } -int add_persistent_topic(const std::string& topic_queue, optional_yield y) { - if (!s_manager) { - return -EAGAIN; - } - return add_persistent_topic(s_manager.get(), s_manager->rados_store.getRados()->get_notif_pool_ctx(), topic_queue, y); -} - int remove_persistent_topic(const DoutPrefixProvider* dpp, librados::IoCtx& rados_ioctx, const std::string& topic_queue, optional_yield y) { librados::ObjectWriteOperation op; op.remove(); @@ -862,13 +855,6 @@ int remove_persistent_topic(const DoutPrefixProvider* dpp, librados::IoCtx& rado return 0; } -int remove_persistent_topic(const std::string& topic_queue, optional_yield y) { - if (!s_manager) { - return -EAGAIN; - } - return remove_persistent_topic(s_manager.get(), s_manager->rados_store.getRados()->get_notif_pool_ctx(), topic_queue, y); -} - rgw::sal::Object* get_object_with_attributes( const reservation_t& res, rgw::sal::Object* obj) { // in case of copy obj, the tags and metadata are taken from source diff --git a/src/rgw/driver/rados/rgw_notify.h b/src/rgw/driver/rados/rgw_notify.h index 0321cbdff3bb1..13b3e3b42bdd3 100644 --- a/src/rgw/driver/rados/rgw_notify.h +++ b/src/rgw/driver/rados/rgw_notify.h @@ -34,16 +34,10 @@ void shutdown(); // create persistent delivery queue for a topic (endpoint) // this operation also add a topic queue to the common (to all RGWs) list of all topics -int add_persistent_topic(const std::string& topic_queue, optional_yield y); - -// same as the above, except you need to provide the IoCtx int add_persistent_topic(const DoutPrefixProvider* dpp, librados::IoCtx& rados_ioctx, const std::string& topic_queue, optional_yield y); // remove persistent delivery queue for a topic (endpoint) // this operation also remove the topic queue from the common (to all RGWs) list of all topics -int remove_persistent_topic(const std::string& topic_queue, optional_yield y); - -// same as the above, except you need to provide the IoCtx int remove_persistent_topic(const DoutPrefixProvider* dpp, librados::IoCtx& rados_ioctx, const std::string& topic_queue, optional_yield y); // struct holding reservation information -- 2.39.5