deleter: handle non-openpilot created files#37728
Open
pkb94 wants to merge 1 commit intocommaai:masterfrom
Open
deleter: handle non-openpilot created files#37728pkb94 wants to merge 1 commit intocommaai:masterfrom
pkb94 wants to merge 1 commit intocommaai:masterfrom
Conversation
Fixes commaai#30102 - Wrap os.listdir() lock check in try/except OSError to handle race conditions and unexpected entry types - Check os.path.islink() before shutil.rmtree(); use os.unlink() for symlinks to avoid NotADirectoryError - Add secondary scan of log root to delete stray files/symlinks that are invisible to listdir_by_creation and would otherwise fill the disk Add 7 new tests covering: stray files, multiple strays, valid symlinks (target preserved), broken symlinks, mixed entries, error recovery, and non-segment directories
Contributor
Process replay diff reportReplays driving segments through this PR and compares the behavior to master. ✅ 0 changed, 66 passed, 0 errors |
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.
Fixes #30102
Description
The deleter crashes with
NotADirectoryErrorwhen stray files (e.g..tar.gzarchives) or symlinks exist in the log root directory. Two root causes:os.listdir(delete_path)was called withouttry/except— crashes on race conditions or unexpected entry typesshutil.rmtree()was called on symlinks, which raisesNotADirectoryErrorlistdir_by_creation()filters to directories only, so stray files/symlinks are never seen and accumulate indefinitely, filling the diskFix
os.listdir()lock check intry/except OSErroros.path.islink()beforeshutil.rmtree(); useos.unlink()for symlinksVerification
Tested with
pytest system/loggerd/tests/test_deleter.py -v. Added 7 new unit tests covering: