Replace CommitFailedException with CommitConflictException #2198
Conversation
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
In some cases, we were using CommitFailedException to represent commit conflicts, which returns the correct 409 response but is tied to Iceberg. However, some of these conflicts originate from Polaris, making CommitConflictException a more appropriate and accurate choice. This change updates those instances to improve clarity and exception handling semantics. Resolves apache#2168
dimas-b
reviewed
Jul 28, 2025
...e/common/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java
Show resolved
Hide resolved
tmater
commented
Jul 29, 2025
...e/common/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java
Show resolved
Hide resolved
github-project-automation
bot
moved this from PRs In Progress
to Ready to merge
in Basic Kanban Board
adutra
previously approved these changes
Jul 30, 2025
| @@ -635,7 +635,7 @@ paths: | |||
| TableToUpdateDoesNotExist: | |||
| $ref: '#/components/examples/NoSuchTableError' | |||
| '409': | |||
| description: Conflict - CommitFailedException, one or more requirements failed. The client may retry. | |||
| description: Conflict - Transaction commit failed due to concurrent modifications. The client may retry. | |||
There was a problem hiding this comment.
This file is generated; the change should go into the appropriate spec and then this file needs to be regenerated.
There was a problem hiding this comment.
Good point about spec change.
However, the code fix in this PR does not require spec changes. I believe the client-facing behaviour is not changed by this PR.
There was a problem hiding this comment.
@tmater : please rollback changes to this file.
There was a problem hiding this comment.
Makes sense, reverted it.
eric-maynard
requested changes
Jul 30, 2025
github-project-automation
bot
moved this from Ready to merge
to PRs In Progress
in Basic Kanban Board
eric-maynard
approved these changes
Jul 31, 2025
github-project-automation
bot
moved this from PRs In Progress
to Ready to merge
in Basic Kanban Board
snazy
approved these changes
Jul 31, 2025
dimas-b
approved these changes
Jul 31, 2025
github-project-automation
bot
moved this from Ready to merge
to Done
in Basic Kanban Board
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.
In some cases, we were using CommitFailedException to represent commit conflicts, which returns the correct 409 response but is tied to Iceberg.
However, some of these conflicts originate from Polaris, making CommitConflictException a more appropriate and accurate choice.
This change updates those instances to improve clarity and exception handling semantics.
Resolves #2168