fix: shutdown blocks for unary deadline time - #1848
Open
toddbaert wants to merge 1 commit into
Open
Conversation
toddbaert
commented
Sep 11, 2026
toddbaert
commented
Member
- an earlier refactor changed the way the shutdown works, in order to remove a sleep
- resulted in incorrect order of some method calls in shutdown - we need to await AFTER we kill the channel
- without this fix, we always awaited for the configured unary RPC deadline before actually closing the channel
* an earlier refactor changed the way the shutdown works, in order to remove a sleep * resulted in incorrect order of some method calls in shutdown - we need to await AFTER we kill the channel * without this fix, we always awaited for the configured unary RPC deadline before actually closing the channel Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Advanced Run ID: 📒 Files selected for processing (3)
Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review. 📝 WalkthroughWalkthroughThe shutdown methods now close channel connectors before awaiting retry scheduler termination. A regression test verifies that an active sync stream cancels and shutdown completes within the configured timeout. ChangesShutdown ordering
Priority: ⬇️ Low Estimated code review effort: 2 (Simple) | ~10 minutes Change: Bug fix Suggested reviewers: Merge Risk: ⚪ Minimal · up to Shutdown now completes promptly for active streams, with regression coverage for the ordering fix. 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches 💡 1📝 Generate docstrings 💡
Comment |
toddbaert
requested review from
JamieSinn,
aepfli,
guidobrei and
jonathannorris
September 11, 2026 16:58
toddbaert
commented
Sep 11, 2026
Comment on lines
176
to
-179
| retryScheduler.shutdownNow(); | ||
| // shut the channel down before awaiting | ||
| grpcComponents.channelConnector.shutdown(); | ||
| ShutdownUtils.awaitTerminationQuietly( | ||
| () -> retryScheduler.awaitTermination(deadline, TimeUnit.MILLISECONDS)); | ||
| grpcComponents.channelConnector.shutdown(); |
Member
Author
There was a problem hiding this comment.
This ordering is wrong - we wait first, and then shutdown (this was due to a refactor which didn't correctly re-order these).
Obviously, we need to shut down the channel and then wait.
toddbaert
commented
Sep 11, 2026
| verify(stub, times(2)).syncFlags(any(), any()); | ||
| } | ||
|
|
||
| @Test |
Member
Author
There was a problem hiding this comment.
This test fails without the fix. I also verified the bug and fix manually.
github-actions
Bot
requested review from
Kavindu-Dodan,
beeme1mr and
thisthat
September 11, 2026 17:13
JamieSinn
approved these changes
Sep 11, 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
5 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.