X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FQemuMigrate.pm;h=e9e9075ab4e3373cfa8505e08d6d1d1b494b8274;hb=d6140280f7ebfbb58efa4c47661b1b216ca01528;hp=75935e0e2b78154d10493919a99c6ee92dd24050;hpb=1d5aaa1db57c6854d240dbdd8e870119f972cace;p=qemu-server.git

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 75935e0..e9e9075 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -269,8 +269,6 @@ sub sync_disks {
     # local volumes which have been copied
     $self->{volumes} = [];
 
-    my $res = [];
-
     eval {
 
 	# found local volumes and their origin
@@ -320,6 +318,7 @@ sub sync_disks {
 	    my ($volid, $attr) = @_;
 
 	    if ($volid =~ m|^/|) {
+		return if $attr->{shared};
 		$local_volumes->{$volid}->{ref} = 'config';
 		die "local file/device\n";
 	    }
@@ -442,6 +441,7 @@ sub sync_disks {
 	    my $logfunc = sub { my ($msg) = @_;  $self->log('info', $msg); };
 	    $rep_volumes = PVE::Replication::run_replication(
 	       'PVE::QemuConfig', $jobcfg, $start_time, $start_time, $logfunc);
+	    $self->{replicated_volumes} = $rep_volumes;
 	}
 
 	foreach my $volid (keys %$local_volumes) {
@@ -600,8 +600,9 @@ sub phase2 {
 
     die "unable to detect remote migration address\n" if !$raddr;
 
+    $self->log('info', "start remote tunnel");
+
     if ($migration_type eq 'secure') {
-	$self->log('info', "start remote tunnel");
 
 	if ($ruri =~ /^unix:/) {
 	    unlink $raddr;
@@ -634,6 +635,9 @@ sub phase2 {
 	} else {
 	    die "unsupported protocol in migration URI: $ruri\n";
 	}
+    } else {
+	#fork tunnel for insecure migration, to send faster commands like resume
+	$self->{tunnel} = $self->fork_tunnel();
     }
 
     my $start = time();
@@ -647,7 +651,7 @@ sub phase2 {
 	    if (scalar(keys %{$self->{target_drive}}) != scalar @{$self->{online_local_volumes}});
 	foreach my $drive (keys %{$self->{target_drive}}){
 	    my $nbd_uri = $self->{target_drive}->{$drive}->{nbd_uri};
-	    $self->log('info', "$drive: start migration to to $nbd_uri");
+	    $self->log('info', "$drive: start migration to $nbd_uri");
 	    PVE::QemuServer::qemu_drive_mirror($vmid, $drive, $nbd_uri, $vmid, undef, $self->{storage_migration_jobs}, 1);
 	}
     }
@@ -688,6 +692,8 @@ sub phase2 {
     # set cachesize to 10% of the total memory
     my $memory =  $conf->{memory} || $defaults->{memory};
     my $cachesize = int($memory * 1048576 / 10);
+    $cachesize = round_powerof2($cachesize);
+
     $self->log('info', "set cachesize: $cachesize");
     eval {
 	PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate-set-cache-size", value => int($cachesize));
@@ -722,7 +728,7 @@ sub phase2 {
     $self->log('info', "migrate uri => $ruri failed: $merr") if $merr;
 
     my $lstat = 0;
-    my $usleep = 2000000;
+    my $usleep = 1000000;
     my $i = 0;
     my $err_count = 0;
     my $lastrem = undef;
@@ -783,8 +789,8 @@ sub phase2 {
 		my $xbzrlepages = $stat->{"xbzrle-cache"}->{"pages"} || 0;
 		my $xbzrlecachemiss = $stat->{"xbzrle-cache"}->{"cache-miss"} || 0;
 		my $xbzrleoverflow = $stat->{"xbzrle-cache"}->{"overflow"} || 0;
-		#reduce sleep if remainig memory if lower than the everage transfert 
-		$usleep = 300000 if $avglstat && $rem < $avglstat;
+		# reduce sleep if remainig memory is lower than the average transfer speed
+		$usleep = 100000 if $avglstat && $rem < $avglstat;
 
 		$self->log('info', "migration status: $stat->{status} (transferred ${trans}, " .
 			   "remaining ${rem}), total ${total})");
@@ -818,16 +824,6 @@ sub phase2 {
 	    die "unable to parse migration status '$stat->{status}' - aborting\n";
 	}
     }
-
-    # just to be sure that the tunnel gets closed on successful migration, on error
-    # phase2_cleanup closes it *after* stopping the remote waiting VM
-    if (!$self->{errors} && $self->{tunnel}) {
-	eval { finish_tunnel($self, $self->{tunnel});  };
-	if (my $err = $@) {
-	    $self->log('err', $err);
-	    $self->{errors} = 1;
-	}
-    }
 }
 
 sub phase2_cleanup {
@@ -926,7 +922,7 @@ sub phase3_cleanup {
     }
 
     # transfer replication state before move config
-    $self->transfer_replication_state();
+    $self->transfer_replication_state() if $self->{replicated_volumes};
 
     # move config to remote node
     my $conffile = PVE::QemuConfig->config_file($vmid);
@@ -935,15 +931,10 @@ sub phase3_cleanup {
     die "Failed to move config to node '$self->{node}' - rename failed: $!\n"
         if !rename($conffile, $newconffile);
 
-    $self->switch_replication_job_target();
+    $self->switch_replication_job_target() if $self->{replicated_volumes};
 
     if ($self->{livemigration}) {
 	if ($self->{storage_migration}) {
-	    # remove drives referencing the nbd server from source
-	    # otherwise vm_stop might hang later on
-	    foreach my $drive (keys %{$self->{target_drive}}){
-		PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "device_del", id => $drive);
-	    }
 	    # stop nbd server on remote vm - requirement for resume since 2.9
 	    my $cmd = [@{$self->{rem_ssh}}, 'qm', 'nbdstop', $vmid];
 
@@ -975,6 +966,20 @@ sub phase3_cleanup {
 		$self->{errors} = 1;
 	    }
 	}
+
+	if ($self->{storage_migration} && PVE::QemuServer::parse_guest_agent($conf)->{fstrim_cloned_disks} && $self->{running}) {
+	    my $cmd = [@{$self->{rem_ssh}}, 'qm', 'guest', 'cmd', $vmid, 'fstrim'];
+	    eval{ PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}) };
+	}
+    }
+
+    # close tunnel on successful migration, on error phase2_cleanup closed it
+    if ($tunnel) {
+	eval { finish_tunnel($self, $tunnel);  };
+	if (my $err = $@) {
+	    $self->log('err', $err);
+	    $self->{errors} = 1;
+	}
     }
 
     eval {
@@ -1034,4 +1039,9 @@ sub final_cleanup {
     # nothing to do
 }
 
+sub round_powerof2 {
+    return 1 if $_[0] < 2;
+    return 2 << int(log($_[0]-1)/log(2));
+}
+
 1;