[fix][broker] Prevent backlog quota cursor updates during topic close#25914
Open
Denovo1998 wants to merge 1 commit into
Open
[fix][broker] Prevent backlog quota cursor updates during topic close#25914Denovo1998 wants to merge 1 commit into
Denovo1998 wants to merge 1 commit into
Conversation
Contributor
Author
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.
Follow-up to #25684
Motivation
BacklogQuotaManageralready skips backlog quota handling when a topic is fenced or closing/deleting. However, the previous guard only checked the topic state when enteringhandleExceededBacklogQuota.If a topic starts closing after that initial check but before the eviction path mutates the slowest cursor, backlog quota eviction can still call
skipEntriesormarkDeletewhile the close/delete path is tearing down the same topic. This follow-up hardens that race without changing the existing fenced-topic behavior from #25684.Modifications
PersistentTopic#isClosingOrDeleting()immediately before direct cursor mutations in backlog quota eviction.ManagedCursor#skipEntriesif the topic starts closing.ManagedCursor#markDeleteif the topic starts closing.@VisibleForTestinghook to coordinate deterministic race reproduction without changing production behavior.Verifying this change
This change added tests and can be verified as follows:
BacklogQuotaManagerTest.testSizeBacklogEvictionRaceWithTopicCloseDoesNotSkipEntriesBacklogQuotaManagerTest.testTimeBacklogEvictionRaceWithTopicCloseDoesNotMarkDeleteVerified locally with:
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes