]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: maybe coredump when reload operator happened 33313/head
authorRichard Bai(白学余) <baixueyu@inspur.com>
Mon, 19 Aug 2019 08:54:52 +0000 (16:54 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 14 Feb 2020 10:58:54 +0000 (11:58 +0100)
Fixes: https://tracker.ceph.com/issues/42119
Signed-off-by: Richard Bai(白学余) <baixueyu@inspur.com>
(cherry picked from commit 78125a8dba6b59b012c642c6b756a2c4f34912b1)

Conflicts:
        src/rgw/rgw_rados.cc
- manual cherry-pick

src/rgw/rgw_rados.cc

index a806be7690cb3467078938f59512bdacc450233d..cc8eea6a7c12df4caaec0b39f7daff49c1e3b060 100644 (file)
@@ -4655,6 +4655,9 @@ int RGWRados::init_complete()
   data_notifier = new RGWDataNotifier(this);
   data_notifier->start();
 
+  binfo_cache = new RGWChainedCacheImpl<bucket_info_entry>;
+  binfo_cache->init(this);
+
   lc = new RGWLC();
   lc->initialize(cct, this);
 
@@ -4672,9 +4675,6 @@ int RGWRados::init_complete()
   }
   ldout(cct, 20) << __func__ << " bucket index max shards: " << bucket_index_max_shards << dendl;
 
-  binfo_cache = new RGWChainedCacheImpl<bucket_info_entry>;
-  binfo_cache->init(this);
-
   bool need_tombstone_cache = !zone_data_notify_to_map.empty(); /* have zones syncing from us */
 
   if (need_tombstone_cache) {