From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 11 Feb 2016 15:29:03 +0000 (-0500)
Subject: rgw: remove RemoteMetaLog::fetch() and admin command
X-Git-Tag: v10.1.0~354^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ebb55b2867fcc399e94607c97d6a0036f2fe21b;p=ceph.git

rgw: remove RemoteMetaLog::fetch() and admin command

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 83d48fac1880..0a3398a60298 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -4474,23 +4474,6 @@ next:
       return -ret;
     }
   }
-  
-  if (opt_cmd == OPT_MDLOG_FETCH) {
-    RGWMetaSyncStatusManager sync(store, store->get_async_rados());
-
-    int ret = sync.init();
-    if (ret < 0) {
-      cerr << "ERROR: sync.init() returned ret=" << ret << std::endl;
-      return -ret;
-    }
-
-    ret = sync.fetch();
-    if (ret < 0) {
-      cerr << "ERROR: sync.fetch() returned ret=" << ret << std::endl;
-      return -ret;
-    }
-
-  }
 
   if (opt_cmd == OPT_METADATA_SYNC_STATUS) {
     RGWMetaSyncStatusManager sync(store, store->get_async_rados());
diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 48a17ce2a179..0279a94cb029 100644
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -1525,19 +1525,6 @@ void RGWRemoteMetaLog::init_sync_env(RGWMetaSyncEnv *env) {
   env->error_logger = error_logger;
 }
 
-int RGWRemoteMetaLog::fetch(int num_shards, vector<string>& clone_markers)
-{
-  list<RGWCoroutinesStack *> stacks;
-  for (int i = 0; i < (int)num_shards; i++) {
-    RGWCoroutinesStack *stack = new RGWCoroutinesStack(store->ctx(), this);
-    stack->call(new RGWCloneMetaLogCoroutine(&sync_env, i, clone_markers[i], NULL));
-
-    stacks.push_back(stack);
-  }
-
-  return run(stacks);
-}
-
 int RGWRemoteMetaLog::read_sync_status(rgw_meta_sync_status *sync_status)
 {
   if (store->is_meta_master()) {
diff --git a/src/rgw/rgw_sync.h b/src/rgw/rgw_sync.h
index 9d4ba49ee457..e7e6292da75f 100644
--- a/src/rgw/rgw_sync.h
+++ b/src/rgw/rgw_sync.h
@@ -172,7 +172,6 @@ public:
   void finish();
 
   int read_log_info(rgw_mdlog_info *log_info);
-  int fetch(int num_shards, vector<string>& clone_markers);
   int read_sync_status(rgw_meta_sync_status *sync_status);
   int init_sync_status(int num_shards);
   int set_sync_info(const rgw_meta_sync_info& sync_info);
@@ -225,7 +224,6 @@ public:
 
   int read_sync_status() { return master_log.read_sync_status(&sync_status); }
   int init_sync_status() { return master_log.init_sync_status(num_shards); }
-  int fetch() { return master_log.fetch(num_shards, clone_markers); }
 
   int run() { return master_log.run_sync(num_shards, sync_status); }