fix: ignore empty directories in device clean scan - #13442
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the agent’s device cleanup scan logic to avoid surfacing empty directories by computing directory trees and sizes in a single recursive traversal, primarily for rollback/upload/download-related cleanup items.
Changes:
- Refactors rollback scan to no longer require
fileOpand instead build rollback trees via the updated helper. - Replaces
loadTreeWithCheck’s size-gating (previously based onGetDirSize) with a new recursive walker that returns both a file tree and aggregated size. - Introduces
loadTreeWithFileSizeto skip empty directories while buildingdto.CleanTreeresults.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.
Suppressed comments (2)
agent/app/service/device_clean.go:869
loadTreeWithFileSizecurrently skips any entry whose computeditem.Sizeis0, which also filters out 0-byte files. The PR title/intent is to ignore empty directories; silently hiding 0-byte files is an additional behavior change and may prevent users from cleaning placeholder/empty files inside otherwise non-empty trees.
if item.Size == 0 {
continue
}
agent/app/service/device_clean.go:828
loadTreeWithChecknow derivesSizeby summingos.DirEntry.Info().Size()vialoadTreeWithFileSize, while most other scan sections usefileOp.GetDirSize()(which usesduand reflects disk usage). This makes the reported sizes inconsistent across cleanup categories and can under-report reclaimable space (e.g., filesystem blocks, sparse files), which may confuse users.
This issue also appears on line 867 of the same file.
func loadTreeWithCheck(treeData []dto.CleanTree, pathItem, treeType string) []dto.CleanTree {
list, size := loadTreeWithFileSize(true, pathItem, treeType, pathItem)
if len(list) == 0 || size == 0 {
return treeData
}
treeData = append(treeData, dto.CleanTree{ID: uuid.NewString(), Label: treeType, Size: size, IsCheck: size > 0, Children: list, Type: treeType, IsRecommend: true, CanDelete: false})
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.
Refs #13435