fix: guard table rename against concurrent commits - #700
Draft
mkuchenbecker wants to merge 1 commit into
Draft
Conversation
Make HTS rename updates version-qualified and atomically advance the row version. Thread the caller's expected metadata location through the catalog and map conflicts to the existing retriable commit path. Add repository, service, controller, catalog, and fixture coverage for stale tokens and forced race interleavings. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mkuchenbecker
marked this pull request as draft
August 27, 2026 01:45
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.
Summary
TLDR. A table rename could silently overwrite a committed snapshot. The rename database update is now conditional on the HTS row version, so a rename that loses the service read-to-update race returns HTTP 409 instead of overwriting the winning commit.
UserTableHtsJdbcRepository.renameTableIdpreviously issued an unconditional JPQL update without a version predicate or version increment. When a rename raced a snapshot commit, it could overwrite the winner'smetadataLocationand report success.This change:
@Versionand increments the version atomically.EntityConcurrentModificationExceptionand HTTP 409.CommitFailedException, preserving Iceberg's existing retry behavior.The new
expectedMetadataLocationquery parameter is optional for HTTP compatibility. Updated catalog callers supply it, while tokenless callers retain the row-version guard across the HTS service read-to-update interval.Changes
Testing Done
Additional Information