From 3d8442effc1c175e0b7c5064ed41bc642f6cdcb0 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 4 May 2016 18:08:38 -0700 Subject: [PATCH] rgw: move around sync_env.init() call sync_env.init() even if we're initalized in RGWRemoteDataLog::init() Signed-off-by: Yehuda Sadeh --- 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 c1af6c896483a..ef4e43412cb19 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -478,12 +478,12 @@ int RGWRemoteDataLog::read_source_log_shards_next(map shard_markers int RGWRemoteDataLog::init(const string& _source_zone, RGWRESTConn *_conn, RGWSyncErrorLogger *_error_logger) { + sync_env.init(store->ctx(), store, _conn, async_rados, &http_manager, _error_logger, _source_zone); + if (initialized) { return 0; } - sync_env.init(store->ctx(), store, _conn, async_rados, &http_manager, _error_logger, _source_zone); - int ret = http_manager.set_threaded(); if (ret < 0) { ldout(store->ctx(), 0) << "failed in http_manager.set_threaded() ret=" << ret << dendl; -- 2.39.5