From cf5c74b8d339c44fd55112c3f7fe75de9d36e49e Mon Sep 17 00:00:00 2001
From: xiaolong ran <xiaolongran@tencent.com>
Date: Tue, 18 Apr 2023 09:45:19 +0800
Subject: [PATCH] [improve] [broker] Fix broker restart logic (#20113)

(cherry picked from commit 092819b5c4a68dbc39d9a650d5370af9455e805d)
---
 .../java/org/apache/pulsar/broker/PulsarService.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
index 0d823a0729c7a..9d6f8bdd7f4b8 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -463,6 +463,12 @@ public CompletableFuture<Void> closeAsync() {
                 protocolHandlers = null;
             }
 
+            // cancel loadShedding task and shutdown the loadManager executor before shutting down the broker
+            if (this.loadSheddingTask != null) {
+                this.loadSheddingTask.cancel();
+            }
+            executorServicesShutdown.shutdown(loadManagerExecutor);
+
             List<CompletableFuture<Void>> asyncCloseFutures = new ArrayList<>();
             if (this.brokerService != null) {
                 CompletableFuture<Void> brokerCloseFuture = this.brokerService.closeAsync();
@@ -497,12 +503,6 @@ public CompletableFuture<Void> closeAsync() {
                 this.leaderElectionService = null;
             }
 
-            // cancel loadShedding task and shutdown the loadManager executor before shutting down the broker
-            if (this.loadSheddingTask != null) {
-                this.loadSheddingTask.cancel();
-            }
-            executorServicesShutdown.shutdown(loadManagerExecutor);
-
             if (adminClient != null) {
                 adminClient.close();
                 adminClient = null;