]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: init oldest period after setting run_sync_thread
authorOrit Wasserman <owasserm@redhat.com>
Wed, 1 Nov 2017 10:15:35 +0000 (12:15 +0200)
committerNathan Cutler <ncutler@suse.com>
Sun, 4 Feb 2018 03:34:40 +0000 (04:34 +0100)
Fixes: http://tracker.ceph.com/issues/21996
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 8b301679161d1405fdae379ff93c33d4d637698d)

src/rgw/rgw_rados.cc

index d2bf23dacff0eee2324ef30b03b1df4dec3890c2..0ffe5e082a3090a68d866b50c9670ae40139590e 100644 (file)
@@ -3900,19 +3900,17 @@ int RGWRados::init_complete()
     obj_expirer->start_processor();
   }
 
-  if (run_sync_thread) {
-    // initialize the log period history. we want to do this any time we're not
-    // running under radosgw-admin, so we check run_sync_thread here before
-    // disabling it based on the zone/zonegroup setup
-    meta_mgr->init_oldest_log_period();
-  }
-
   /* no point of running sync thread if we don't have a master zone configured
      or there is no rest_master_conn */
   if (get_zonegroup().master_zone.empty() || !rest_master_conn) {
     run_sync_thread = false;
   }
 
+  if (run_sync_thread) {
+    // initialize the log period history
+    meta_mgr->init_oldest_log_period();
+  }
+
   async_rados = new RGWAsyncRadosProcessor(this, cct->_conf->rgw_num_async_rados_threads);
   async_rados->start();