From 12cae9e702c3cbb3bc87f57d0654ade7a9b1f993 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 18 Feb 2016 11:11:13 -0500 Subject: [PATCH] rgw: remove RGWMetadataManager::store_md_log_entries Signed-off-by: Casey Bodley --- src/rgw/rgw_metadata.cc | 8 -------- src/rgw/rgw_metadata.h | 3 --- src/rgw/rgw_sync.cc | 3 +-- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc index 75cab8957c482..2f0d1e98174c9 100644 --- a/src/rgw/rgw_metadata.cc +++ b/src/rgw/rgw_metadata.cc @@ -384,14 +384,6 @@ RGWMetadataLog* RGWMetadataManager::get_log(const std::string& period) return &insert.first->second; } -int RGWMetadataManager::store_md_log_entries(list& entries, - const std::string& period, int shard_id, - librados::AioCompletion *completion) -{ - auto md_log = get_log(period); - return md_log->store_entries_in_shard(entries, shard_id, completion); -} - int RGWMetadataManager::register_handler(RGWMetadataHandler *handler) { string type = handler->get_type(); diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h index ba7e624291306..d4e511e42ac8e 100644 --- a/src/rgw/rgw_metadata.h +++ b/src/rgw/rgw_metadata.h @@ -265,9 +265,6 @@ public: RGWMetadataHandler *get_handler(const string& type); - int store_md_log_entries(list& entries, const std::string& period, - int shard_id, librados::AioCompletion *completion); - int put_entry(RGWMetadataHandler *handler, const string& key, bufferlist& bl, bool exclusive, RGWObjVersionTracker *objv_tracker, time_t mtime, map *pattrs = NULL); int remove_entry(RGWMetadataHandler *handler, string& key, RGWObjVersionTracker *objv_tracker); diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc index 15a4090f7c57a..4b491e2fd5cf0 100644 --- a/src/rgw/rgw_sync.cc +++ b/src/rgw/rgw_sync.cc @@ -1827,8 +1827,7 @@ int RGWCloneMetaLogCoroutine::state_store_mdlog_entries() RGWAioCompletionNotifier *cn = stack->create_completion_notifier(); - RGWRados *store = sync_env->store; - int ret = store->meta_mgr->store_md_log_entries(dest_entries, shard_id, cn->completion()); + int ret = mdlog->store_entries_in_shard(dest_entries, shard_id, cn->completion()); if (ret < 0) { cn->put(); ldout(cct, 10) << "failed to store md log entries shard_id=" << shard_id << " ret=" << ret << dendl; -- 2.39.5