xds: Fix shutdownNow() becoming a no-op after shutdown() - #12982
Merged
kannanjgithub merged 1 commit intoAug 14, 2026
Conversation
This fixes `XdsServerWrapper.shutdownNow()` silently doing nothing once `shutdown()` had already been called, permanently hanging threads blocked in `start()`. Previously they shared a single guard flag, meaning whichever was called first made the other a complete no-op. The fix gives `shutdownNow()`'s forceful-only work its own independent guard, following the same two-guard pattern already used by `ManagedChannelImpl`/`ServerImpl` in grpc-java core, so it always runs exactly once regardless of call order. Includes a regression test that reproduces the hang against the old code and passes against the fix. Signed-off-by: Martin Baillie <martin@baillie.id>
martinbaillie
changed the title
becoming a no-op after shutdown()`shutdownNow() becoming a no-op after shutdown()
kannanjgithub
added
the
kokoro:force-run
grpc-kokoro
removed
the
kokoro:force-run
kannanjgithub
approved these changes
Aug 13, 2026
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
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.
This fixes
XdsServerWrapper.shutdownNow()silently doing nothing onceshutdown()had already been called, permanently hanging threads blocked instart(). Previously they shared a single guard flag, meaning whichever was called first made the other a complete no-op.The fix gives
shutdownNow()'s forceful-only work its own independent guard, following the same two-guard pattern already used byManagedChannelImpl/ServerImplin grpc-java core, so it always runs exactly once regardless of call order.Includes a regression test that reproduces the hang against the old code and passes against the fix.