Recursively skip trash dirs, not just the dirs themself

cs3org · Oct 8, 2024 · 2808eca · 2808eca
1 parent 45bbaae
commit 2808eca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/storage/fs/posix/tree/assimilation.go b/pkg/storage/fs/posix/tree/assimilation.go
@@ -566,9 +566,9 @@ func (t *Tree) WarmupIDCache(root string, assimilate, onlyDirty bool) error {
 
 	sizes := make(map[string]int64)
 	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
-		// skip lock files
-		if isLockFile(path) {
-			return nil
+		// skip lock and upload files
+		if isLockFile(path) || isTrash(path) || t.isUpload(path) {
+			return filepath.SkipDir
 		}
 
 		if err != nil {