fix(cleanup): re-snapshot tombstone after cross-device move - #5
Merged
Conversation
Building on the shutil.move EXDEV fix, a cross-device copy creates new inodes, so the pre-move snapshot no longer matches the tombstone. The pending document therefore recorded the original (pre-move) dev/ino and drain_cleanup's validate_cleanup_object failed: cleanup tombstone object identity changed: . Re-snapshot the tombstone after the move and publish that as the pending document (the one drain_cleanup validates against). The prepare/intent document keeps the pre-move snapshot; only the pending document is refreshed, preserving the cleanup state machine.
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.
Problem
After the EXDEV fix (
shutil.move),install-clifailed with:Root cause
A cross-device
shutil.movefalls back to copy+unlink, creating new inodes. The pre-move snapshot (captured for the intent document) was reused for the pending document, sodrain_cleanup'svalidate_cleanup_objectcompared the tombstone's new dev/ino against the original pre-move record and failed.Fix
Re-snapshot the tombstone after the move and publish that as the pending document (the one
drain_cleanupvalidates against). The prepare/intent document keeps the pre-move snapshot; only the pending document is refreshed.Verification
python3 scripts/run_harnesses.py --module nddev-qwen-code-app --lane fast # 60 tests OK (1 skipped), validate_fast.sh PASS