rebase

canonical · Jan 31, 2024 · 000a967 · 000a967
1 parent 4a930e4
commit 000a967
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lxd/storage/drivers/driver_ceph_utils.go b/lxd/storage/drivers/driver_ceph_utils.go
@@ -1150,6 +1150,8 @@ func (d *ceph) sendVolume(conn io.ReadWriteCloser, volumeName string, volumePare
 	// Redirect output to stdout.
 	args = append(args, "-")
 
+	fmt.Println("--> rbd", args)
+
 	cmd := exec.Command("rbd", args...)
 
 	stderr, err := cmd.StderrPipe()
@@ -1193,6 +1195,8 @@ func (d *ceph) receiveVolume(volumeName string, conn io.ReadWriteCloser, writeWr
 		volumeName,
 	}
 
+	fmt.Println("--> rbd", args)
+
 	cmd := exec.Command("rbd", args...)
 
 	stdin, err := cmd.StdinPipe()

diff --git a/lxd/storage/drivers/driver_ceph_volumes.go b/lxd/storage/drivers/driver_ceph_volumes.go
@@ -1676,7 +1676,7 @@ func (d *ceph) MigrateVolume(vol Volume, conn io.ReadWriteCloser, volSrcArgs *mi
 			// In this case the first snapshot gets transferred completely without being able to create a diff.
 			// This also happens if the snapshot doesn't yet exist on the target.
 			if existingSourceSnapName == sourceSnapName && i > 0 {
-				existingSourceParentSnapName = fmt.Sprintf("snapshot_%s", existingSourceSnapName)
+				existingSourceParentSnapName = fmt.Sprintf("snapshot_%s", volSrcArgs.SourceSnapshots[i-1])
 			}
 		}