From: Matt Benjamin <mbenjamin@redhat.com>
Date: Thu, 8 Sep 2022 16:46:55 +0000 (-0400)
Subject: rgw/main: cause ratelimiter to destruct in AppMain::shutdown()
X-Git-Tag: v18.0.0~56^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c855a1a10e06b8a14560342ad0a02e588a93cdc6;p=ceph-ci.git

rgw/main: cause ratelimiter to destruct in AppMain::shutdown()

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index 95d3ee18526..6719de12ddb 100644
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -603,6 +603,6 @@ void rgw::AppMain::shutdown(std::function<void(void)> finalize_async_signals)
 #ifdef WITH_RADOSGW_KAFKA_ENDPOINT
   rgw::kafka::shutdown();
 #endif
-
   rgw_perf_stop(g_ceph_context);
+  ratelimiter.reset(); // deletes--ensure this happens before we destruct
 } /* AppMain::shutdown */