Skip to content

[core][python] Disable automatic conflict rollback by default - #10768

Merged
JingsongLi merged 6 commits into
apache:masterfrom
XiaoHongbo-Hope:codex/prevent-destructive-conflict-rollback
Oct 24, 2026
Merged

JingsongLi merged 6 commits into
apache:masterfrom
XiaoHongbo-Hope:codex/prevent-destructive-conflict-rollback

Conversation

@XiaoHongbo-Hope

@XiaoHongbo-Hope XiaoHongbo-Hope commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Automatic conflict rollback can delete committed snapshots and tags already used by readers.

Remove automatic rollback and its unused plumbing from Python. Make it opt-in for Java via commit.auto-rollback.enabled (default false). Conflict detection, Python row-ID rewriting, and explicit rollback APIs remain unchanged. Requires upgrading writers.

Validation: 10 Java rollback/configuration cases passed; 72 Python commit, shard-update, and REST rollback tests passed, plus the Ray retry regression. Covers default/disabled/enabled rollback, conflict detection, and tag preservation.

@XiaoHongbo-Hope
XiaoHongbo-Hope marked this pull request as draft October 23, 2026 04:26
@XiaoHongbo-Hope XiaoHongbo-Hope changed the title [core][python] Preserve committed snapshots during conflict recovery [core][python] Disable automatic conflict rollback by default Oct 23, 2026
@XiaoHongbo-Hope
XiaoHongbo-Hope marked this pull request as ready for review October 23, 2026 09:40
@JingsongLi JingsongLi closed this Oct 24, 2026
@JingsongLi JingsongLi reopened this Oct 24, 2026
@JingsongLi

Copy link
Copy Markdown
Contributor

+1

@JingsongLi
JingsongLi merged commit 4790703 into apache:master Oct 24, 2026
31 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants