[fix][broker] Prevent duplicate geo-replicated messages after target topic reload#25860
Open
void-ptr974 wants to merge 3 commits into
Open
[fix][broker] Prevent duplicate geo-replicated messages after target topic reload#25860void-ptr974 wants to merge 3 commits into
void-ptr974 wants to merge 3 commits into
Conversation
665700d to
18bde31
Compare
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.
Fixes #25861
Motivation
This fixes correctness issues in persistent geo-replication V2 deduplication. These issues are in the core replication data path and can produce duplicate messages on the target cluster during normal recovery/failover paths.
Geo-replication V2 deduplication uses the source topic position as the target-side dedup watermark. For a replicated message, the source replicator adds
__MSG_PROP_REPL_SOURCE_POSITION=<source-ledger-id>:<source-entry-id>, and the target broker stores the latest replicated source position as the dedup watermark for that replicator producer.This state is not normal producer sequence state. It is the target-side checkpoint used to identify whether a replayed source entry has already been persisted.
There are four related problems in the current handling of this watermark:
The geo V2 watermark is not recovered from replayed target entries
When deduplication is enabled or a target topic is loaded, the broker restores dedup state from the
pulsar.dedupcursor snapshot and then replays entries after that snapshot.The existing replay path restores normal producer sequence ids from message metadata, but it does not rebuild geo V2 watermark state from replicated messages. If the target topic is unloaded after replicated messages are persisted but before the latest dedup snapshot includes their source positions, the in-memory geo watermark is lost.
If the source replicator later reconnects and replays from its replication cursor, the target broker can fail to identify those source entries as duplicates and persist them again.
The geo V2 watermark must be handled atomically
A geo V2 watermark is a pair: source ledger id and source entry id. Treating the two values as independent mutable states can expose a mixed pair to duplicate checks or snapshots, for example a new ledger id combined with an old entry id.
Such a mixed pair does not represent a real source position. If it is snapshotted and later recovered, the target can either move the watermark too far forward and drop valid replayed source entries, or move it backward and allow duplicates.
Replay recovery must never move the watermark backward
Source-position replay is expected during reconnects and failovers. When rebuilding the watermark from target entries, older source positions can appear after newer positions in recovery windows. The recovered watermark must therefore keep the maximum source position seen so far instead of blindly overwriting the current value.
The geo V2 watermark can be removed by normal producer inactivity cleanup
Normal producer dedup state can be purged after producer inactivity. Geo V2 watermark state has a different lifecycle: it is a source-position checkpoint for replication, not the lifecycle state of the replicator producer.
The source replicator may disconnect, reconnect, or fail over and replay the same source entries from its replication cursor. If the target has purged the geo watermark because the replicator producer was inactive, those replayed source entries can be accepted and written again.
A concrete failure window is:
This does not require client misuse or corrupted input. Source cursor replay is an expected recovery behavior, so target-side geo dedup state must survive topic reload and producer inactivity cleanup.
Modifications
replicatedFromand__MSG_PROP_REPL_SOURCE_POSITIONfrom persisted replicated messages._LID/_EIDmap entries.ConcurrentHashMap.computefor the geo V2 pushed watermark so duplicate checks and watermark advancement are atomic per replicator producer without taking a global lock.replicatedFrom._LID/_EIDpairs in dedup snapshots. Replication watermarks are expected to be small in number, so the snapshot keeps them before applying the normal-producer snapshot limit.Performance impact
The geo V2 publish path now allocates one small immutable source-position object for replicated messages and uses
ConcurrentHashMap.computescoped to the current replicator producer. This avoids a global lock and only serializes updates for the same replication producer, which is the state that must be ordered for correctness.Snapshot cost remains proportional to the number of active dedup states. Replication watermarks are expected to be bounded by the number of geo/shadow replication producers, not by application producer count, so storing all complete replication watermark pairs should have negligible overhead compared with normal producer dedup state.
Verifying this change
This change added tests and can be verified as follows:
Additional local checks:
Result:
BUILD SUCCESSFUL.Does this pull request potentially affect one of the following parts: