sync_disks: be more verbose if storage_migrate fails

[qemu-server.git] / PVE / QemuMigrate.pm

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 14f3fcbbc0471fbc153793bc871717194ffbe4bb..5ed953add834e76d3680028cf48bc4a803156592 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -389,6 +389,8 @@ sub sync_disks {
 
            $local_volumes->{$volid}->{ref} = $attr->{referenced_in_config} ? 'config' : 'snapshot';
 
+           $local_volumes->{$volid}->{is_vmstate} = $attr->{is_vmstate} ? 1 : 0;
+
            if ($attr->{cdrom}) {
                if ($volid =~ /vm-\d+-cloudinit/) {
                    $local_volumes->{$volid}->{ref} = 'generated';
@@ -552,10 +554,16 @@ sub sync_disks {
                    'bwlimit' => $bwlimit,
                    'insecure' => $opts->{migration_type} eq 'insecure',
                    'with_snapshots' => $local_volumes->{$volid}->{snapshots},
+                   'allow_rename' => !$local_volumes->{$volid}->{is_vmstate},
                };
 
-               my $new_volid = PVE::Storage::storage_migrate($storecfg, $volid, $self->{ssh_info},
-                                                             $targetsid, $storage_migrate_opts);
+               my $new_volid = eval {
+                   PVE::Storage::storage_migrate($storecfg, $volid, $self->{ssh_info},
+                                                 $targetsid, $storage_migrate_opts);
+               };
+               if (my $err = $@) {
+                   die "storage migration for '$volid' to storage '$targetsid' failed - $err\n";
+               }
 
                $self->{volume_map}->{$volid} = $new_volid;
                $self->log('info', "volume '$volid' is '$new_volid' on the target\n");
@@ -838,14 +846,20 @@ sub phase2 {
            my $source_drive = PVE::QemuServer::parse_drive($drive, $conf->{$drive});
            my $target_drive = PVE::QemuServer::parse_drive($drive, $target->{drivestr});
 
-           my $source_sid = PVE::Storage::Plugin::parse_volume_id($source_drive->{file});
-           my $target_sid = PVE::Storage::Plugin::parse_volume_id($target_drive->{file});
+           my $source_volid = $source_drive->{file};
+           my $target_volid = $target_drive->{file};
+
+           my $source_sid = PVE::Storage::Plugin::parse_volume_id($source_volid);
+           my $target_sid = PVE::Storage::Plugin::parse_volume_id($target_volid);
 
            my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', [$source_sid, $target_sid], $opt_bwlimit);
            my $bitmap = $target->{bitmap};
 
            $self->log('info', "$drive: start migration to $nbd_uri");
            PVE::QemuServer::qemu_drive_mirror($vmid, $drive, $nbd_uri, $vmid, undef, $self->{storage_migration_jobs}, 'skip', undef, $bwlimit, $bitmap);
+
+           $self->{volume_map}->{$source_volid} = $target_volid;
+           $self->log('info', "volume '$source_volid' is '$target_volid' on the target\n");
        }
     }
 
@@ -1114,13 +1128,6 @@ 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 with block-job-cancel, to disconnect source VM from NBD
        # to avoid it trying to re-establish it. We are in blockjob ready state,
@@ -1131,16 +1138,11 @@ sub phase3_cleanup {
            eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $self->{storage_migration_jobs}) };
            eval { PVE::QemuMigrate::cleanup_remotedisks($self) };
            die "Failed to complete storage migration: $err\n";
-       } else {
-           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);
-           }
        }
     }
 
-    # only write after successfully completing the migration
-    if ($self->{volume_map} || $self->{storage_migration}) {
+    if ($self->{volume_map}) {
+       PVE::QemuConfig->update_volume_ids($conf, $self->{volume_map});
        PVE::QemuConfig->write_config($vmid, $conf);
     }