[fix][broker] Fix cannot shutdown broker gracefully by admin api #24731
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lhotari
reviewed
Sep 11, 2025
Member
lhotari
left a comment
There was a problem hiding this comment.
Great catch! just a few minor comments about parameter naming
pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
Outdated
Show resolved
Hide resolved
pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
Outdated
Show resolved
Hide resolved
lhotari
approved these changes
Sep 12, 2025
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #24731 +/- ##
============================================
- Coverage 74.27% 74.18% -0.09%
- Complexity 33569 33595 +26
============================================
Files 1896 1900 +4
Lines 148111 148377 +266
Branches 17164 17204 +40
============================================
+ Hits 110009 110079 +70
- Misses 29370 29500 +130
- Partials 8732 8798 +66
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
lhotari
pushed a commit
that referenced
this pull request
Sep 12, 2025
) (cherry picked from commit 4169395)
lhotari
pushed a commit
that referenced
this pull request
Sep 12, 2025
) (cherry picked from commit 4169395)
lhotari
pushed a commit
that referenced
this pull request
Sep 16, 2025
) (cherry picked from commit 4169395)
lhotari
pushed a commit
that referenced
this pull request
Sep 16, 2025
) (cherry picked from commit 4169395)
nodece
pushed a commit
to ascentstream/pulsar
that referenced
this pull request
Sep 16, 2025
…che#24731) (cherry picked from commit 4169395)
ganesh-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Sep 18, 2025
…che#24731) (cherry picked from commit 4169395) (cherry picked from commit 79926b9)
srinath-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Sep 18, 2025
…che#24731) (cherry picked from commit 4169395) (cherry picked from commit 79926b9)
manas-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Sep 19, 2025
…che#24731) (cherry picked from commit 4169395) (cherry picked from commit 8fd9638)
Member
2 tasks
srinath-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Sep 19, 2025
…che#24731) (cherry picked from commit 4169395) (cherry picked from commit 8fd9638)
Contributor
Author
Shawyeok
added a commit
to Shawyeok/pulsar
that referenced
this pull request
Sep 20, 2025
…ntUnload Revise `BrokerServiceTest.testShutDownWithMaxConcurrentUnload`, since apache#24731 fixed the issue where the broker couldn’t be shut down via Pulsar Admin. The original test contains a race condition in its assertion. ```java admin.brokers().shutDownBrokerGracefully(1, false); Awaitility.await().atLeast(bundleNum - 1, TimeUnit.SECONDS).untilAsserted(() -> { assertEquals(pulsar.getBrokerService().getTopics().size(), 0); // race condition: pulsar.getBrokerService() is possibly be null because the broker is shutting down }); ```
15 tasks
KannarFr
pushed a commit
to CleverCloud/pulsar
that referenced
this pull request
Sep 22, 2025
walkinggo
pushed a commit
to walkinggo/pulsar
that referenced
this pull request
Oct 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #23982
Motivation
The graceful broker shutdown endpoint (
/admin/v2/brokers/shutdown) was experiencing a deadlock when called via the admin API. The issue occurred because:PulsarService.closeAsync()→WebService.close()The stack trace shows the thread stuck in
CountDownLatch.await()inFutureCallback.get(), waiting indefinitely for the shutdown to complete.Click to show full stacktrace
Modifications
Modified
PulsarService.closeAsync():closeAsync(boolean waitForStop)closeAsync()now callscloseAsync(true)for backward compatibilityFixed
BrokersBase.shutDownBrokerGracefully():pulsar().closeAsync(false)instead ofpulsar().closeAsync()Verifying this change
This change added tests and can be verified as follows:
testShutdownViaAdminApi()inPulsarServiceTest.javaDoes this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
docdoc-requireddoc-not-neededdoc-completeMatching PR in forked repository
PR in forked repository: