Repository navigation
Flink: Cherry-pick #16011 and its v1.20/v2.0 backport - Fix duplicate commits in DynamicCommitter when Flink jobId changes on restart - #10
Merged
nickwu241 merged 6 commits intoSep 22, 2026
Conversation
nickwu241
force-pushed
the
nick/cherry-pick-16011-dynamic-committer
branch
from
September 8, 2026 18:32
d002fa8 to
0007093
Compare
nickwu241
changed the title
…nges on restart (apache#16011) Cherry-pick of apache#16011. Upstream commit: apache/iceberg@c11404c
nickwu241
force-pushed
the
nick/cherry-pick-16011-dynamic-committer
branch
2 times, most recently
from
September 8, 2026 18:41
da11f45 to
ca5c888
Compare
nickwu241
force-pushed
the
nick/cherry-pick-16011-dynamic-committer
branch
from
September 8, 2026 18:47
ca5c888 to
be156de
Compare
nickwu241
changed the title
nickwu241
force-pushed
the
nick/cherry-pick-16011-dynamic-committer
branch
from
September 17, 2026 19:26
8712708 to
7a148cd
Compare
version.txt was previously untracked, so build.gradle's getProjectVersion() silently falls back to a git-describe-derived version if the file is ever missing from the working tree (e.g. after a checkout/clean) instead of failing loudly. This has already caused one unintended publish under 1.10.0-SNAPSHOT. AFFIRM_VERSIONS.md records which Affirm-local patches are carried by each published version. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
nickwu241
force-pushed
the
nick/cherry-pick-16011-dynamic-committer
branch
from
September 17, 2026 19:42
7a148cd to
7782d42
Compare
|
|
Git tags are the source of truth for the commit published to Artifactory, not this file.
Member
Author
|
@davkim Good catch — fixed by dropping the "Published commit" field from |
davkim
approved these changes
Sep 18, 2026
davkim
left a comment
davkim
left a comment
There was a problem hiding this comment.
comment addressed - let's just make sure the CI passes
…herry-pick-16011-dynamic-committer
Records the Docker Hub -> Quay MinIO fix as part of 1.11.0-affirm-patch.1 now that it's merged onto 1.11.0-affirm-patch. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Member
Author
|
Passes all CI tests now! |
nickwu241
added a commit
that referenced
this pull request
Sep 25, 2026
nickwu241
added a commit
that referenced
this pull request
Sep 25, 2026
nickwu241
added a commit
that referenced
this pull request
Sep 25, 2026
* Document and stage 1.11.0-affirm-patch.2 Bumps version.txt and adds the AFFIRM_VERSIONS.md changelog entry for the next patch release, covering the 3 review-triggered fixes from all-the-things#222721 (#12/#13/#14). Those PRs are open, not yet merged — rebase this branch onto 1.11.0-affirm-patch once they land, then tag 1.11.0-affirm-patch.2 at the resulting commit and publish per RUNBOOK_ICEBERG_PATCH_PUBLISH.md. * Update AFFIRM_VERSIONS.md: base off 1.11.0-affirm-patch.1, drop reviewer names * Drop #10/#11 from .2 table (already covered by .1 base) * Note #12/#13/#14 merged and branch rebased; ready to tag * Drop 'not yet published' framing now that .2 contents are final * Drop trailing note from .2 section to match .1 format
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.
Cherry-picks apache#16011 onto
1.11.0-affirm-patch, coveringflink/v2.1,flink/v1.20, andflink/v2.0.Fixes duplicate commits in
DynamicCommitterwhen the Flink jobId changes on restart (e.g. stop-with-savepoint, autoscaler resubmit). The committer previously deduped commits using only the newest jobId in a batch, which hid snapshots produced under a prior jobId and caused replayed committables to be committed a second time.This is included in the upstream Iceberg 1.12.0 milestone, so this cherry-pick should no longer be needed once we upgrade to 1.12.
Commits
Conflicts resolved (both commits)
Each cherry-pick hit the same import-only conflict in
TestDynamicIcebergSink.java, in all three Flink modules: upstream adds imports fororg.apache.flink.api.common.JobIDandorg.apache.flink.api.common.operators.SlotSharingGroup.SlotSharingGroupturned out unused/dead on this branch — this branch already carries the native-slot-sharing-group-inheritance backport, so that part of the upstream diff doesn't apply here. Kept only theJobIDimport; no logic changes were needed to resolve.