[pve-devel] [PATCH v3 qemu-server 15/22] Take note of changes to the volume IDs when migrating and update the config

[Fabian Ebner]

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 PVE/QemuMigrate.pm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 464abc6..3c601ff 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -271,7 +271,9 @@ sub sync_disks {
     my $conf = $self->{vmconf};
 
     # local volumes which have been copied
+    # and their old_id => new_id pairs
     $self->{volumes} = [];
+    $self->{volume_map} = {};
 
     my $override_targetsid = $self->{opts}->{targetstorage};
 
@@ -489,8 +491,11 @@ sub sync_disks {
 		    'with_snapshots' => $local_volumes->{$volid}->{snapshots},
 		};
 
-		PVE::Storage::storage_migrate($self->{storecfg}, $volid,
-		    $self->{ssh_info}, $targetsid, $storage_migrate_opts);
+		my $new_volid = PVE::Storage::storage_migrate($self->{storecfg}, $volid,
+				    $self->{ssh_info}, $targetsid, $storage_migrate_opts);
+
+		$self->{volume_map}->{$volid} = $new_volid if $volid ne $new_volid;
+		$self->log('info', "volume '$volid' is '$new_volid' on the target\n");
 	    }
 	}
     };
@@ -970,6 +975,13 @@ sub phase3_cleanup {
 
     my $tunnel = $self->{tunnel};
 
+    # Needs to happen before printing the drives that where migrated via qemu,
+    # since a new volume on the target might have the same ID as an old volume
+    # on the source and update_volume_ids relies on matching IDs in the config.
+    if ($self->{volume_map}) {
+	PVE::QemuConfig->update_volume_ids($conf, $self->{volume_map});
+    }
+
     if ($self->{storage_migration}) {
 	# finish block-job
 	eval { PVE::QemuServer::qemu_drive_mirror_monitor($vmid, undef, $self->{storage_migration_jobs}); };
@@ -982,11 +994,15 @@ sub phase3_cleanup {
 	    foreach my $target_drive (keys %{$self->{target_drive}}) {
 		my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{drivestr});
 		$conf->{$target_drive} = PVE::QemuServer::print_drive($drive);
-		PVE::QemuConfig->write_config($vmid, $conf);
 	    }
 	}
     }
 
+    # only write after successfully completing the migration
+    if ($self->{volume_map} || $self->{storage_migration}) {
+	PVE::QemuConfig->write_config($vmid, $conf);
+    }
+
     # transfer replication state before move config
     $self->transfer_replication_state() if $self->{replicated_volumes};
 
-- 
2.20.1