From 5a4dff44b6a2314efa7c08ffc7d0f0ff1dea7a86 Mon Sep 17 00:00:00 2001
From: xiaolongran <xiaolongran@tencent.com>
Date: Mon, 17 Apr 2023 14:18:45 +0800
Subject: [PATCH] [Improve] Fix broker restart logic

Signed-off-by: xiaolongran <xiaolongran@tencent.com>
---
 .../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 aad7d32f732c5..5fc9920d0f215 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
@@ -467,6 +467,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();
@@ -501,12 +507,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;