]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: move around sync_env.init()
authorYehuda Sadeh <yehuda@redhat.com>
Thu, 5 May 2016 01:08:38 +0000 (18:08 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 9 May 2016 21:36:41 +0000 (14:36 -0700)
call sync_env.init() even if we're initalized in RGWRemoteDataLog::init()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_data_sync.cc

index c1af6c896483a9f1dd6bd23978d02907ae36d7c1..ef4e43412cb198fdb17b1197a4842e3056656028 100644 (file)
@@ -478,12 +478,12 @@ int RGWRemoteDataLog::read_source_log_shards_next(map<int, string> 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;