[fix][broker] Prevent completing replicated snapshot before marker publish#26119
Open
Denovo1998 wants to merge 2 commits into
Open
Conversation
void-ptr974
approved these changes
Jul 2, 2026
void-ptr974
left a comment
Contributor
There was a problem hiding this comment.
This PR makes replicated subscription snapshot completion wait for the final snapshot marker publish result. If publishing the final marker fails, the snapshot remains pending so the existing timeout retry path can handle it.
It also guards concurrent timeout/completion races and adds tests for final marker publish failure and timeout cleanup behavior.
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
Replicated subscription snapshots are currently marked as completed immediately after publishing the final snapshot marker. However, marker publishing on persistent topics completes asynchronously, so the final marker may still fail after the snapshot has already been removed from the pending map and recorded as the last completed snapshot.
When this happens, the existing timeout-based retry path cannot recover because the snapshot is no longer pending.
Modifications
CompletableFuture.Verifying this change
(Please pick either of the following options)
This change is a trivial rework / code cleanup without any test coverage.
(or)
This change is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(example:)
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes