Merge pull request #4673 from mmaslankaprv/v21.11.x

[v21.11.x] redpanda: shutdown quota manager after kafka server is stopped
redpanda-data · May 27, 2022 · 61698c0 · 61698c0
2 parents a29b5a1 + 718e46c
commit 61698c0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/v/redpanda/application.cc b/src/v/redpanda/application.cc
@@ -692,6 +692,11 @@ void application::wire_up_redpanda_services() {
             _rpc.stop().get();
         }
     });
+
+    // metrics and quota management
+    syschecks::systemd_message("Adding kafka quota manager").get();
+    construct_service(quota_mgr).get();
+
     _deferred.emplace_back([this] {
         if (_kafka_server.local_is_initialized()) {
             _kafka_server.invoke_on_all(&rpc::server::wait_for_shutdown).get();
@@ -800,9 +805,6 @@ void application::wire_up_redpanda_services() {
         coprocessing->start().get();
     }
 
-    // metrics and quota management
-    syschecks::systemd_message("Adding kafka quota manager").get();
-    construct_service(quota_mgr).get();
     // rpc
     ss::sharded<rpc::server_configuration> rpc_cfg;
     rpc_cfg.start(ss::sstring("internal_rpc")).get();