]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: fix conflict with cloud sync
authorCasey Bodley <cbodley@redhat.com>
Fri, 13 Apr 2018 20:29:21 +0000 (16:29 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 13 Apr 2018 20:31:05 +0000 (16:31 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_data_sync.cc

index e77cc37f6516a38df838695ed96b3a4ca293d855..606372feb0ea5f276aa598ec6a56a43cccc9d544 100644 (file)
@@ -714,7 +714,7 @@ int RGWRemoteDataLog::read_recovering_shards(const int num_shards, set<int>& rec
   RGWHTTPManager http_manager(store->ctx(), crs.get_completion_mgr());
   int ret = http_manager.start();
   if (ret < 0) {
-    ldout(store->ctx(), 0) << "failed in http_manager.set_threaded() ret=" << ret << dendl;
+    ldout(store->ctx(), 0) << "failed in http_manager.start() ret=" << ret << dendl;
     return ret;
   }
   RGWDataSyncEnv sync_env_local = sync_env;
@@ -2249,7 +2249,7 @@ int RGWRemoteDataLog::read_shard_status(int shard_id, set<string>& pending_bucke
   // cannot run concurrently with run_sync(), so run in a separate manager
   RGWCoroutinesManager crs(store->ctx(), store->get_cr_registry());
   RGWHTTPManager http_manager(store->ctx(), crs.get_completion_mgr());
-  int ret = http_manager.set_threaded();
+  int ret = http_manager.start();
   if (ret < 0) {
     ldout(store->ctx(), 0) << "failed in http_manager.start() ret=" << ret << dendl;
     return ret;