fix(): Fix Cross-Device Bug — Use Instead of Raw - #4
Merged
Conversation
Contributor
Author
|
@edaywalid can you please review this? |
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.
PR: Fix
OpExchangeCross-Device Bug — UseswapAnyInstead of Rawos.RenameIssue
The
OpExchangehandler used three rawos.Renamecalls to swap files back during undo operations.os.Renameultimately callsrename(2), which fails withEXDEVwhen the session store and working files are located on different filesystems. As a result, undo operations could silently fail, leaving files in an inconsistent state.Fix
Replaced the three manual
os.Renamecalls with:This is the same helper already used by
OpMod.swapAny:os.Renamefirst for same-filesystem moves.EXDEVoccurs.Before
The undo path performed three sequential renames:
Problems:
After
The undo path now performs a single swap operation:
Benefits:
Code Diff
Before
After
Files Changed
internal/restore/restore.goos.Renamecalls withswapAny(field(0), field(1)).internal/restore/restore_test.goTestExchangeto verify cross-device-safe exchange behavior.Verification
UNDO_DATA_DIR=/dev/shm/undo-test go test ./internal/restore/ -run TestExchange