Don't cache old id if a copy is detected

Author: rhafer

pkg/storage/fs/posix/tree/assimilation.go

@@ -924,16 +924,24 @@ func (t *Tree) WarmupIDCache(root string, assimilate, onlyDirty bool) error {
 
 			if id != "" {
 				// Check if the item on the previous still exists. In this case it might have been a copy with extended attributes -> set new ID
+				isCopy := false
 				previousPath, ok := t.lookup.GetCachedID(context.Background(), spaceID, id)
 				if ok && previousPath != path {
-					// this id clashes with an existing id -> re-assimilate
 					_, err := os.Stat(previousPath)
 					if err == nil {
-						_ = t.assimilate(scanItem{Path: path, Trigger: "warmup id cache - id clash"})
+						// previous path still exists -> this is a copy
+						isCopy = true
 					}
 				}
-				if err := t.lookup.CacheID(context.Background(), spaceID, id, path); err != nil {
-					t.log.Error().Err(err).Str("spaceID", spaceID).Str("id", id).Str("path", path).Msg("could not cache id")
+				if isCopy {
+					// copy detected -> re-assimilate
+					_ = t.assimilate(scanItem{Path: path, Trigger: "warmup id cache - id clash, previous path: " + previousPath})
+				} else {
+					// update cache with new path
+					t.log.Debug().Str("path", path).Str("id", id).Msg("caching id")
+					if err := t.lookup.CacheID(context.Background(), spaceID, id, path); err != nil {
+						t.log.Error().Err(err).Str("spaceID", spaceID).Str("id", id).Str("path", path).Msg("could not cache id")
+					}
 				}
 			}
 		} else if assimilate {