Undo oldParent change on rename errors correctly

yandex-cloud · Sep 16, 2021 · 7e5c42e · 7e5c42e
1 parent c137c8f
commit 7e5c42e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/internal/file.go b/internal/file.go
@@ -1186,10 +1186,12 @@ func (inode *Inode) SendUpload() bool {
 			var unmoveName string
 			if err != nil {
 				log.Errorf("Error renaming object from %v to %v: %v", from, key, err)
-				unmoveParent = inode.oldParent
-				unmoveName = inode.oldName
-				inode.oldParent = oldParent
-				inode.oldName = oldName
+				if inode.oldParent != oldParent || inode.oldName != oldName {
+					unmoveParent = inode.oldParent
+					unmoveName = inode.oldName
+					inode.oldParent = oldParent
+					inode.oldName = oldName
+				}
 			} else {
 				if inode.oldParent == oldParent && inode.oldName == oldName {
 					inode.oldParent = nil