From fd31f2dd3730700d87c3b12a3ff509a50176a31f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 13 Apr 2018 16:29:21 -0400 Subject: [PATCH] rgw: fix conflict with cloud sync Signed-off-by: Casey Bodley --- src/rgw/rgw_data_sync.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index e77cc37f651..606372feb0e 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -714,7 +714,7 @@ int RGWRemoteDataLog::read_recovering_shards(const int num_shards, set& 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& 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; -- 2.39.5