[fix][test] Fix flaky ProducerCleanupTest timer cleanup#25864
Merged
lhotari merged 2 commits intoMay 25, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
ProducerCleanupTest#testAllTimerTaskShouldCanceledAfterProducerClosedis flaky because the test assertedHashedWheelTimer.pendingTimeouts()on the shared test client immediately after producer close. The producer close path cancels the send timeout and producer stats timeout, but Netty'sHashedWheelTimerremoves cancelled timeouts asynchronously in the timer worker. Under load,pendingTimeouts()can still report the cancelled tasks for a short period.Example failure:
Modifications
PulsarClientin the test so the timer assertion only observes tasks created by this test.producer.close()to exercise the cancellation path.Thread.sleep(2000)and one-shot assertion with Awaitility, waiting up to 10 seconds for Netty's timer worker to clean up cancelled timeouts.Verifying this change
If the box was checked, please highlight the changes