operations: don't merge DirMove over an existing directory - fixes #8253 - #9842
Open
ShravanthReddy wants to merge 1 commit into
Open
operations: don't merge DirMove over an existing directory - fixes #8253#9842ShravanthReddy wants to merge 1 commit into
ShravanthReddy wants to merge 1 commit into
Conversation
…lone#8253 POSIX rename-over-dir must fail. DirMove treated ErrorDirExists as a reason to fall through to a file-move merge, which succeeded and broke borg exclusive locks on rclone mount. Only ErrorCantDirMove still falls back (combine, rclone#7661).
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.
What does this change do?
Don't fall through to a file-move merge when DirMove hits an existing destination directory. POSIX rename-over-dir must fail; the merge was succeeding and breaking borg exclusive locks on rclone mount. Only
ErrorCantDirMovestill falls back (combine, #7661).Linked issue
Fixes #8253
Checklist
test_allpasses for this backend and if submitting a new backend can provide a test account for the integration tester - see CONTRIBUTING.md.AI-assisted; FAIL then PASS verified locally (
go test ./fs/operations -run TestDirMove, combineTestLocal|TestMemory|TestMixed). I take ownership of the change. Docs n/a.