X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FQemuMigrate.pm;h=36f6fda54bfdadfa4baf267fc056da31612192e8;hb=d652f7b1ab64bef3972b70d4ae14e1e05e07db5e;hp=100c5835a503067592a83e5d2790dce5f945def1;hpb=7126e1c9bb2a6c91786bae16ef55d14b8562f2ea;p=qemu-server.git

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 100c583..36f6fda 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -13,6 +13,9 @@ use PVE::Storage;
 use PVE::QemuServer;
 use Time::HiRes qw( usleep );
 use PVE::RPCEnvironment;
+use PVE::ReplicationConfig;
+use PVE::ReplicationState;
+use JSON;
 
 use base qw(PVE::AbstractMigrate);
 
@@ -269,21 +272,22 @@ sub sync_disks {
 	}
 
 	my $test_volid = sub {
-	    my ($volid, $is_cdrom, $snapname) = @_;
-
-	    return if !$volid;
+	    my ($volid, $attr) = @_;
 
 	    if ($volid =~ m|^/|) {
 		$local_volumes->{$volid} = 'config';
 		die "local file/device\n";
 	    }
 
-	    if ($is_cdrom) {
+	    my $snaprefs = $attr->{referenced_in_snapshot};
+
+	    if ($attr->{cdrom}) {
 		if ($volid eq 'cdrom') {
 		    my $msg = "can't migrate local cdrom drive";
-		    $msg .= " (referenced in snapshot '$snapname')"
-			if defined($snapname);
-
+		    if (defined($snaprefs) && !$attr->{referenced_in_config}) {
+			my $snapnames = join(', ', sort keys %$snaprefs);
+			$msg .= " (referenced in snapshot - $snapnames)";
+		    }
 		    &$log_error("$msg\n");
 		    return;
 		}
@@ -301,16 +305,16 @@ sub sync_disks {
 
 	    $sharedvm = 0;
 
-	    $local_volumes->{$volid} = defined($snapname) ? 'snapshot' : 'config';
+	    $local_volumes->{$volid} = $attr->{referenced_in_config} ? 'config' : 'snapshot';
 
-	    die "local cdrom image\n" if $is_cdrom;
+	    die "local cdrom image\n" if $attr->{cdrom};
 
 	    my ($path, $owner) = PVE::Storage::path($self->{storecfg}, $volid);
 
 	    die "owned by other VM (owner = VM $owner)\n"
 		if !$owner || ($owner != $self->{vmid});
 
-	    if (defined($snapname)) {
+	    if (defined($snaprefs)) {
 		# we cannot migrate shapshots on local storage
 		# exceptions: 'zfspool' or 'qcow2' files (on directory storage)
 
@@ -325,32 +329,20 @@ sub sync_disks {
 		if PVE::Storage::volume_is_base_and_used($self->{storecfg}, $volid);
 	};
 
-	my $test_drive = sub {
-	    my ($ds, $drive, $snapname) = @_;
-
-	    eval {
-		&$test_volid($drive->{file}, PVE::QemuServer::drive_is_cdrom($drive), $snapname);
-	    };
-
-	    &$log_error($@, $drive->{file}) if $@;
-	};
-
-	foreach my $snapname (keys %{$conf->{snapshots}}) {
-	    eval {
-		&$test_volid($conf->{snapshots}->{$snapname}->{'vmstate'}, 0, undef)
-		    if defined($conf->{snapshots}->{$snapname}->{'vmstate'});
-	    };
-	    &$log_error($@, $conf->{snapshots}->{$snapname}->{'vmstate'}) if $@;
-
-	    PVE::QemuServer::foreach_drive($conf->{snapshots}->{$snapname}, $test_drive, $snapname);
-	}
-	PVE::QemuServer::foreach_drive($conf, $test_drive);
+	PVE::QemuServer::foreach_volid($conf, sub {
+	    my ($volid, $attr) = @_;
+	    eval { $test_volid->($volid, $attr); };
+	    if (my $err = $@) {
+		&$log_error($err, $volid);
+	    }
+        });
 
 	foreach my $vol (sort keys %$local_volumes) {
 	    if ($local_volumes->{$vol} eq 'storage') {
 		$self->log('info', "found local disk '$vol' (via storage)\n");
 	    } elsif ($local_volumes->{$vol} eq 'config') {
-		die "can't live migrate attached local disks without with-local-disks option\n" if $self->{running} && !$self->{opts}->{"with-local-disks"};
+		&$log_error("can't live migrate attached local disks without with-local-disks option\n", $vol)
+		    if $self->{running} && !$self->{opts}->{"with-local-disks"};
 		$self->log('info', "found local disk '$vol' (in current VM config)\n");
 	    } elsif ($local_volumes->{$vol} eq 'snapshot') {
 		$self->log('info', "found local disk '$vol' (referenced by snapshot(s))\n");
@@ -391,15 +383,30 @@ sub sync_disks {
 	    }
 	}
 
+	my $rep_volumes;
+
 	$self->log('info', "copying disk images");
 
+	my $rep_cfg = PVE::ReplicationConfig->new();
+
+	if (my $jobcfg = $rep_cfg->find_local_replication_job($vmid, $self->{node})) {
+	    die "can't live migrate VM with replicated volumes\n" if $self->{running};
+	    my $start_time = time();
+	    my $logfunc = sub { my ($msg) = @_;  $self->log('info', $msg); };
+	    $rep_volumes = PVE::Replication::run_replication(
+	       'PVE::QemuConfig', $jobcfg, $start_time, $start_time, $logfunc);
+	}
+
 	foreach my $volid (keys %$local_volumes) {
 	    my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
 	    if ($self->{running} && $self->{opts}->{targetstorage} && $local_volumes->{$volid} eq 'config') {
 		push @{$self->{online_local_volumes}}, $volid;
 	    } else {
+		next if $rep_volumes->{$volid};
 		push @{$self->{volumes}}, $volid;
-		PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info}, $sid);
+		my $insecure = $self->{opts}->{migration_type} eq 'insecure';
+		PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info}, $sid,
+					      undef, undef, undef, undef, $insecure);
 	    }
 	}
     };
@@ -482,18 +489,7 @@ sub phase2 {
 
     push @$cmd , 'qm', 'start', $vmid, '--skiplock', '--migratedfrom', $nodename;
 
-    # we use TCP only for unsecure migrations as TCP ssh forward tunnels often
-    # did appeared to late (they are hard, if not impossible, to check for)
-    # secure migration use UNIX sockets now, this *breaks* compatibilty when trying
-    # to migrate from new to old but *not* from old to new.
-    my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
-
-    my $migration_type = 'secure';
-    if (defined($self->{opts}->{migration_type})) {
-	$migration_type = $self->{opts}->{migration_type};
-    } elsif (defined($datacenterconf->{migration}->{type})) {
-        $migration_type = $datacenterconf->{migration}->{type};
-    }
+    my $migration_type = $self->{opts}->{migration_type};
 
     push @$cmd, '--migration_type', $migration_type;
 
@@ -878,6 +874,9 @@ sub phase3_cleanup {
 	}
     }
 
+    # transfer replication state before move config
+    $self->transfer_replication_state();
+
     # move config to remote node
     my $conffile = PVE::QemuConfig->config_file($vmid);
     my $newconffile = PVE::QemuConfig->config_file($vmid, $self->{node});
@@ -885,6 +884,8 @@ sub phase3_cleanup {
     die "Failed to move config to node '$self->{node}' - rename failed: $!\n"
         if !rename($conffile, $newconffile);
 
+    $self->switch_replication_job_target();
+
     if ($self->{livemigration}) {
 	if ($self->{storage_migration}) {
 	    # remove drives referencing the nbd server from source