backport of commit a3a637e (#18131)

This pull request was automerged via backport-assistant
hashicorp · Aug 2, 2023 · 7188603 · 7188603
1 parent 4a644f5
commit 7188603
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.changelog/18108.txt b/.changelog/18108.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+migration: Fixed a bug where previous alloc logs were destroyed when migrating ephemeral_disk on the same client
+```
diff --git a/client/allocwatcher/alloc_watcher.go b/client/allocwatcher/alloc_watcher.go
@@ -276,15 +276,7 @@ func (p *localPrevAlloc) Migrate(ctx context.Context, dest *allocdir.AllocDir) e
 
 	p.logger.Debug("copying previous alloc")
 
-	moveErr := dest.Move(p.prevAllocDir, p.tasks)
-
-	// Always cleanup previous alloc
-	if err := p.prevAllocDir.Destroy(); err != nil {
-		p.logger.Error("error destroying alloc dir",
-			"error", err, "previous_alloc_dir", p.prevAllocDir.AllocDir)
-	}
-
-	return moveErr
+	return dest.Move(p.prevAllocDir, p.tasks)
 }
 
 // remotePrevAlloc is a prevAllocWatcher for previous allocations on remote