From: Casey Bodley Date: Fri, 29 Jan 2016 19:59:35 +0000 (-0500) Subject: rgw: remove unused clone_shards() in metadata sync X-Git-Tag: v10.1.0~354^2~29 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10cdb8866b025a9e88bdfa68b74922feb514d6ba;p=ceph.git rgw: remove unused clone_shards() in metadata sync clone_shards() was an exact duplicate for fetch() Signed-off-by: Casey Bodley --- diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc index 2191ddbba2e0..dfcaf16c54ae 100644 --- a/src/rgw/rgw_sync.cc +++ b/src/rgw/rgw_sync.cc @@ -1618,19 +1618,6 @@ void RGWRemoteMetaLog::init_sync_env(RGWMetaSyncEnv *env) { env->error_logger = error_logger; } -int RGWRemoteMetaLog::clone_shards(int num_shards, vector& clone_markers) -{ - list 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::fetch(int num_shards, vector& clone_markers) { list stacks; diff --git a/src/rgw/rgw_sync.h b/src/rgw/rgw_sync.h index e7d4b212df81..29c5942b26be 100644 --- a/src/rgw/rgw_sync.h +++ b/src/rgw/rgw_sync.h @@ -175,7 +175,6 @@ public: int list_shard(int shard_id); int list_shards(int num_shards); int get_shard_info(int shard_id); - int clone_shards(int num_shards, vector& clone_markers); int fetch(int num_shards, vector& clone_markers); int read_sync_status(rgw_meta_sync_status *sync_status); int init_sync_status(int num_shards); @@ -230,7 +229,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 clone_shards() { return master_log.clone_shards(num_shards, clone_markers); } int run() { return master_log.run_sync(num_shards, sync_status); }