From 7787dfb4926dcc2baa7530b620ae8cfccf90bc30 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 10 Jun 2020 10:53:55 -0400 Subject: [PATCH] rgw: stop realm reloader before store shutdown otherwise the two could race to destroy the store Fixes: https://tracker.ceph.com/issues/45969 Signed-off-by: Casey Bodley --- src/rgw/rgw_main.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 3fc16007a38e1..21c8c28fae777 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -603,10 +603,11 @@ int radosgw_Main(int argc, const char **argv) // add a watcher to respond to realm configuration changes RGWPeriodPusher pusher(store); RGWFrontendPauser pauser(fes, implicit_tenant_context, &pusher); - RGWRealmReloader reloader(store, service_map_meta, &pauser); + std::optional reloader(std::in_place, store, + service_map_meta, &pauser); RGWRealmWatcher realm_watcher(g_ceph_context, store->svc()->zone->get_realm()); - realm_watcher.add_watcher(RGWRealmNotify::Reload, reloader); + realm_watcher.add_watcher(RGWRealmNotify::Reload, *reloader); realm_watcher.add_watcher(RGWRealmNotify::ZonesNeedPeriod, pusher); #if defined(HAVE_SYS_PRCTL_H) @@ -619,6 +620,8 @@ int radosgw_Main(int argc, const char **argv) derr << "shutting down" << dendl; + reloader.reset(); // stop the realm reloader + for (list::iterator liter = fes.begin(); liter != fes.end(); ++liter) { RGWFrontend *fe = *liter; -- 2.39.5