Repository navigation
Flink: Forward watermarks in EqualityConvertCommitter with no active cycle - #18439
Open
developer-rpai wants to merge 1 commit into
Open
developer-rpai wants to merge 1 commit into
developer-rpai wants to merge 1 commit into
Conversation
developer-rpai
force-pushed
the
fix-18435-flink-lock-watermark
branch
from
October 9, 2026 23:05
2784848 to
68bc0b0
Compare
This branch has not been deployed
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
1 participant
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.
When ConvertEqualityDeletes shares the Flink-maintained lock with another maintenance task, the lock is never released: EqualityConvertCommitter.processWatermark drops watermarks while planResult == null, stalling the unioned watermark that LockRemoverOperator needs to emit the lock release. The fix forwards watermarks when no conversion cycle is active and keeps the hold-back behavior mid-cycle. Fixes #18435.
Test plan: new forwardsWatermarkWithoutActiveCycle unit test asserts a watermark is forwarded with no plan received; existing holdsBackWatermarkUntilCommit still covers the mid-cycle hold-back. Note: the same pattern exists in flink/v1.20 and flink/v2.2 — left for a follow-up to keep this minimal. Could not compile locally (no JDK on this machine); relying on CI.