proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-02 16:35:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migration: add nbd migrated volumes to volume_map earlier

Browse Source 
and avoid a little bit of duplication by creating a helper

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-01-29 16:11:37 +01:00 committed by Thomas Lamprecht
parent c3417e3b6e
commit efbbe59da4
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PVE/QemuMigrate.pm
View File

@ -846,6 +846,22 @@ sub phase2 {
} }
} }
my $handle_storage_migration_listens = sub {
my ($drive_key, $drivestr, $nbd_uri) = @_;
$self->{stopnbd} = 1;
$self->{target_drive}->{$drive_key}->{drivestr} = $drivestr;
$self->{target_drive}->{$drive_key}->{nbd_uri} = $nbd_uri;
my $source_drive = PVE::QemuServer::parse_drive($drive_key, $conf->{$drive_key});
my $target_drive = PVE::QemuServer::parse_drive($drive_key, $drivestr);
my $source_volid = $source_drive->{file};
my $target_volid = $target_drive->{file};
$self->{volume_map}->{$source_volid} = $target_volid;
$self->log('info', "volume '$source_volid' is '$target_volid' on the target\n");
};
my $target_replicated_volumes = {}; my $target_replicated_volumes = {};
# Note: We try to keep $spice_ticket secret (do not pass via command line parameter) # Note: We try to keep $spice_ticket secret (do not pass via command line parameter)
@ -877,9 +893,7 @@ sub phase2 {
my $targetdrive = $3; my $targetdrive = $3;
$targetdrive =~ s/drive-//g; $targetdrive =~ s/drive-//g;
$self->{stopnbd} = 1; $handle_storage_migration_listens->($targetdrive, $drivestr, $nbd_uri);
$self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
$self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
} elsif ($line =~ m!^storage migration listens on nbd:unix:(/run/qemu-server/(\d+)_nbd\.migrate):exportname=(\S+) volume:(\S+)$!) { } elsif ($line =~ m!^storage migration listens on nbd:unix:(/run/qemu-server/(\d+)_nbd\.migrate):exportname=(\S+) volume:(\S+)$!) {
my $drivestr = $4; my $drivestr = $4;
die "Destination UNIX socket's VMID does not match source VMID" if $vmid ne $2; die "Destination UNIX socket's VMID does not match source VMID" if $vmid ne $2;
@ -888,9 +902,7 @@ sub phase2 {
my $targetdrive = $3; my $targetdrive = $3;
$targetdrive =~ s/drive-//g; $targetdrive =~ s/drive-//g;
$self->{stopnbd} = 1; $handle_storage_migration_listens->($targetdrive, $drivestr, $nbd_uri);
$self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
$self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
$unix_socket_info->{$nbd_unix_addr} = 1; $unix_socket_info->{$nbd_unix_addr} = 1;
} elsif ($line =~ m/^re-using replicated volume: (\S+) - (.*)$/) { } elsif ($line =~ m/^re-using replicated volume: (\S+) - (.*)$/) {
my $drive = $1; my $drive = $1;
@ -929,19 +941,13 @@ sub phase2 {
my $nbd_uri = $target->{nbd_uri}; my $nbd_uri = $target->{nbd_uri};
my $source_drive = PVE::QemuServer::parse_drive($drive, $conf->{$drive}); my $source_drive = PVE::QemuServer::parse_drive($drive, $conf->{$drive});
my $target_drive = PVE::QemuServer::parse_drive($drive, $target->{drivestr});
my $source_volid = $source_drive->{file}; my $source_volid = $source_drive->{file};
my $target_volid = $target_drive->{file};
my $bwlimit = $local_volumes->{$source_volid}->{bwlimit}; my $bwlimit = $local_volumes->{$source_volid}->{bwlimit};
my $bitmap = $target->{bitmap}; my $bitmap = $target->{bitmap};
$self->log('info', "$drive: start migration 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}, 'skip', undef, $bwlimit, $bitmap); 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");
} }
} }