From 3cfec2a16087faba9a9cee84b5120f04ff194810 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Richard=20Bai=28=E7=99=BD=E5=AD=A6=E4=BD=99=29?= Date: Mon, 19 Aug 2019 16:54:52 +0800 Subject: [PATCH] rgw: maybe coredump when reload operator happened MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: https://tracker.ceph.com/issues/42119 Signed-off-by: Richard Bai(白学余) (cherry picked from commit 78125a8dba6b59b012c642c6b756a2c4f34912b1) Conflicts: src/rgw/rgw_rados.cc - manual cherry-pick --- src/rgw/rgw_rados.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index a806be7690cb3..cc8eea6a7c12d 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; + 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; - binfo_cache->init(this); - bool need_tombstone_cache = !zone_data_notify_to_map.empty(); /* have zones syncing from us */ if (need_tombstone_cache) { -- 2.39.5