loggerd: enhance deleter to handle stray files in log root for improved robustness #35245
Conversation
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
There was a problem hiding this comment.
Thanks for contributing to openpilot! In order for us to review your PR as quickly as possible, check the following:
- Convert your PR to a draft unless it's ready to review
- Read the contributing docs
- Before marking as "ready for review", ensure:
- the goal is clearly stated in the description
- all the tests are passing
- the change is something we merge
- include a route or your device' dongle ID if relevant
adeebshihadeh
requested changes
May 25, 2025
| # delete stray files first | ||
| files = [item for item in all_items if os.path.isfile(os.path.join(log_root, item))] | ||
| for file in files: | ||
| os.remove(os.path.join(log_root, file)) |
| all_items = os.listdir(log_root) | ||
|
|
||
| # delete stray files first | ||
| files = [item for item in all_items if os.path.isfile(os.path.join(log_root, item))] |
There was a problem hiding this comment.
this doesn't handle directories
| @@ -115,3 +115,14 @@ def test_no_delete_with_lock_file(self): | |||
| self.join_thread() | |||
|
|
|||
| assert f_path.exists(), "File deleted when locked" | |||
|
|
|||
| def test_delete_stray_file_in_log_root(self): | |||
| f_path = self.make_file_with_data("", self.f_type, 1) | |||
There was a problem hiding this comment.
this test should create all sorts of random files and directories to really stress this path
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.
Description
This PR addresses issue #30102, where deleter previously failed to handle non-directory files placed directly under the log root directory (e.g., user-created stray files).
This PR modified
deleter_threadto include deletion of files directly underPaths.log_root(), in addition to existing directory cleanup logic.This is a first step — I plan to add more unit tests covering diverse file and directory structures, along with corresponding improvements to
deleterin follow-up commits.Verification
Added a unit test
test_delete_stray_file_in_log_rootthat places a stray file in the log root and asserts it is successfully deleted. Achieved 100% test coverage for the newly added logic.