Repository navigation
[core] Do not classify index-manifest read failures as conflicts - #10215
Closed
LuciferYang wants to merge 1 commit into
Closed
LuciferYang wants to merge 1 commit into
LuciferYang wants to merge 1 commit into
Conversation
The deletion-vector conflict check wrapped the index-manifest read into its catch-all around the DV-enrichment builders, so an IO or filesystem failure while reading the index manifest surfaced as "File deletion conflicts detected! Give up committing." — mislabeling the root cause and pushing the committer toward a pointless rollback of a valid snapshot. Read the manifest with the IOException-throwing variant outside the conflict catch and let IO failures propagate wrapped with the manifest name and snapshot id; only the pure invariant failures of the DV builders remain classified as conflicts. Assisted-by: GLM-5.3
LuciferYang
marked this pull request as draft
October 2, 2026 03:18
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
1 participant
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.
Purpose
The deletion-vector conflict check in
ConflictDetection.checkConflictswrapped the index-manifest read inside the catch-all around the DV enrichment builders. An IO or filesystem failure while reading the index manifest was therefore reported as "File deletion conflicts detected! Give up committing.", hiding the real cause and pushing the committer toward a needless rollback of a valid snapshot.This reads the index manifest with the IOException-throwing variant outside the conflict catch and rethrows IO failures wrapped with the manifest name and snapshot id. Only the genuine invariant failures of the DV builders stay classified as conflicts.
Tests
Added
ConflictDetectionTest.testIndexManifestReadFailureIsNotClassifiedAsConflict: it forces the index-manifest read to fail with an IOException and assertscheckConflictssurfaces aRuntimeExceptionnaming the manifest read failure with the IOException as its root cause, instead of returning a conflict result.API and Format
No.
Documentation
No.