Skip to content

[core] Keep main's snapshots when fast_forward fails and hold the commit lock #10845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LuciferYang wants to merge 2 commits into
base: master
Choose a base branch
from
+1,038 −38
Open

[core] Keep main's snapshots when fast_forward fails and hold the commit lock #10845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad094a9
[core] Keep main's snapshots when fast_forward fails and hold the com…
LuciferYang Oct 27, 2026
02d7d67
[core] Check the lease after reading, fail on undeleted files and com…
LuciferYang Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion paimon-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,8 @@ public BranchManager branchManager() {
snapshotManager(),
tagManager(),
schemaManager(),
new BranchMergeHandler(this::switchToBranch));
new BranchMergeHandler(this::switchToBranch),
() -> catalogEnvironment.snapshotCommit(snapshotManager(), coreOptions(), null));
}

@Override
Expand Down
8 changes: 6 additions & 2 deletions paimon-core/src/main/java/org/apache/paimon/table/CatalogEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,13 @@ public SchemaModification schemaModification() {
return SchemaModification.create(catalog, identifier);
}

/** Create a publisher owning the writer's lock and its catalog resources. */
/**
* Create a publisher owning the writer's lock and its catalog resources. Callers that only need
* the lock pass a null commit user; locks that require a writer identity, such as REST commit
* leases, reject it.
*/
public SnapshotCommit snapshotCommit(
SnapshotManager snapshotManager, CoreOptions options, String commitUser) {
SnapshotManager snapshotManager, CoreOptions options, @Nullable String commitUser) {
Identifier lockIdentifier =
identifier == null
? null
Expand Down
Loading
Loading