rgw: remove RGWMetadataManager::store_md_log_entries

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 75cab8957c482e9274c973242ff5f4116206fac8..2f0d1e98174c99bdb38247f3f295575d0cb998d8 100644 (file)
--- 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<cls_log_entry>& 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 ba7e624291306e2123ae70d03d953721921c74ba..d4e511e42ac8eb080e71402dbe39ac45065ee572 100644 (file)
--- 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<cls_log_entry>& 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<string, bufferlist> *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 15a4090f7c57a0b77fe35e35d009f57453728328..4b491e2fd5cf08e22dd1a9245f93b951629516b8 100644 (file)
--- 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;