From: Richard Bai(白学余) <baixueyu@inspur.com>
Date: Mon, 19 Aug 2019 08:54:52 +0000 (+0800)
Subject: rgw: maybe coredump when reload operator happened
X-Git-Tag: v13.2.9~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33313%2Fhead;p=ceph.git

rgw: maybe coredump when reload operator happened

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
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index a806be7690c..cc8eea6a7c1 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -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) {