From d45d8750e82748ed89054d71effea9030a861e5b Mon Sep 17 00:00:00 2001
From: Alex Russell <alex@sengine.cloud>
Date: Sat, 10 Oct 2026 20:25:49 +0200
Subject: [PATCH] filer: do not sweep the old prefix of a directory rename that
 copied

Removing the old directory on the remote deletes everything under its
prefix. Run after the commit, that could also take an object another
rename copied in under the same path meanwhile. When a child was copied,
leave the prefix alone and delete only the copied children's old keys.
---
 weed/server/filer_grpc_server_rename.go             | 12 +++++++-----
 weed/server/filer_grpc_server_rename_remote_test.go |  5 ++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/weed/server/filer_grpc_server_rename.go b/weed/server/filer_grpc_server_rename.go
index 8c67f7bba..90938420e 100644
--- a/weed/server/filer_grpc_server_rename.go
+++ b/weed/server/filer_grpc_server_rename.go
@@ -151,8 +151,7 @@ type metadataEvent struct {
 	newEntry     *filer.Entry
 	deleteChunks bool
 	// the old entry's remote object is deleted once the rename has committed:
-	// it, or an object under it, was copied to the new key, and a rename that
-	// fails must not lose it
+	// it was copied to the new key, and a rename that fails must not lose it
 	deleteOldRemote bool
 }
 
@@ -350,16 +349,19 @@ func (fs *FilerServer) moveSelfEntry(ctx context.Context, stream filer_pb.Seawee
 		deleteOldRemote: copiedRemote != nil,
 	})
 	selfEvent := len(*metadataEvents) - 1
+	keepOldRemote := copiedRemote != nil
 
 	if moveFolderSubEntries != nil {
 		if moveChildrenErr := moveFolderSubEntries(); moveChildrenErr != nil {
 			return moveChildrenErr
 		}
 		// removing the old directory on the remote removes every object under
-		// it, so it waits for the commit too once a child was copied
+		// its prefix, the copied children's old keys included, which must wait
+		// for the commit. Those are deleted one by one after it instead, and
+		// nothing else under the prefix is touched.
 		for _, event := range (*metadataEvents)[selfEvent+1:] {
 			if event.deleteOldRemote {
-				(*metadataEvents)[selfEvent].deleteOldRemote = true
+				keepOldRemote = true
 				break
 			}
 		}
@@ -368,7 +370,7 @@ func (fs *FilerServer) moveSelfEntry(ctx context.Context, stream filer_pb.Seawee
 	// delete old entry
 	ctx = context.WithValue(ctx, "OP", "MV")
 	deleteCtx := filer.WithSuppressedMetadataEvents(ctx)
-	if (*metadataEvents)[selfEvent].deleteOldRemote {
+	if keepOldRemote {
 		deleteCtx = filer.WithKeepRemoteObject(deleteCtx)
 	}
 	deleteErr := fs.filer.DeleteEntryMetaAndData(deleteCtx, oldPath, false, false, false, false, signatures, 0)
diff --git a/weed/server/filer_grpc_server_rename_remote_test.go b/weed/server/filer_grpc_server_rename_remote_test.go
index dc57de8c3..f52a24fcd 100644
--- a/weed/server/filer_grpc_server_rename_remote_test.go
+++ b/weed/server/filer_grpc_server_rename_remote_test.go
@@ -275,12 +275,11 @@ func TestRenameDirectoryCopiesRemoteOnlyChildren(t *testing.T) {
 
 	require.NoError(t, renameFile(server, "/buckets/b/src", "/buckets/b/moved"))
 
-	// b.jpg's old object goes with its entry; the old directory and a.jpg's
-	// old object wait for the commit
+	// b.jpg's old object goes with its entry, a.jpg's waits for the commit,
+	// and the old prefix is not swept: it could hold a newer object by then
 	assert.Equal(t, []string{
 		"copy origin/src/a.jpg origin/moved/a.jpg",
 		"delete origin/src/b.jpg",
-		"rmdir origin/src",
 		"delete origin/src/a.jpg",
 	}, client.recorded())
 	moved, err := store.FindEntry(context.Background(), "/buckets/b/moved/a.jpg")