proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 06:54:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename 'volid' to 'drivestr' where it's not only a volume ID

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-01-29 14:30:08 +01:00 committed by Fabian Grünbichler
parent 86ea0ed0e0
commit 8b02e56870
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/QemuMigrate.pm
View File

@ -491,7 +491,7 @@ sub cleanup_remotedisks {
foreach my $target_drive (keys %{$self->{target_drive}}) { foreach my $target_drive (keys %{$self->{target_drive}}) {
my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{volid}); my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{drivestr});
my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file}); my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file});
my $cmd = [@{$self->{rem_ssh}}, 'pvesm', 'free', "$storeid:$volname"]; my $cmd = [@{$self->{rem_ssh}}, 'pvesm', 'free', "$storeid:$volname"];
@ -612,12 +612,12 @@ sub phase2 {
$spice_port = int($1); $spice_port = int($1);
} }
elsif ($line =~ m/^storage migration listens on nbd:(localhost|[\d\.]+|\[[\d\.:a-fA-F]+\]):(\d+):exportname=(\S+) volume:(\S+)$/) { elsif ($line =~ m/^storage migration listens on nbd:(localhost|[\d\.]+|\[[\d\.:a-fA-F]+\]):(\d+):exportname=(\S+) volume:(\S+)$/) {
my $volid = $4; my $drivestr = $4;
my $nbd_uri = "nbd:$1:$2:exportname=$3"; my $nbd_uri = "nbd:$1:$2:exportname=$3";
my $targetdrive = $3; my $targetdrive = $3;
$targetdrive =~ s/drive-//g; $targetdrive =~ s/drive-//g;
$self->{target_drive}->{$targetdrive}->{volid} = $volid; $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
$self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri; $self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
} elsif ($line =~ m/^QEMU: (.*)$/) { } elsif ($line =~ m/^QEMU: (.*)$/) {
@ -687,7 +687,7 @@ sub phase2 {
my $target = $self->{target_drive}->{$drive}; my $target = $self->{target_drive}->{$drive};
my $nbd_uri = $target->{nbd_uri}; my $nbd_uri = $target->{nbd_uri};
my $source_sid = PVE::Storage::Plugin::parse_volume_id($conf->{$drive}); my $source_sid = PVE::Storage::Plugin::parse_volume_id($conf->{$drive});
my $target_sid = PVE::Storage::Plugin::parse_volume_id($target->{volid}); my $target_sid = PVE::Storage::Plugin::parse_volume_id($target->{drivestr});
my $bwlimit = PVE::Storage::get_bandwidth_limit('migrate', [$source_sid, $target_sid], $opt_bwlimit); my $bwlimit = PVE::Storage::get_bandwidth_limit('migrate', [$source_sid, $target_sid], $opt_bwlimit);
$self->log('info', "$drive: start migration to $nbd_uri"); $self->log('info', "$drive: start migration to $nbd_uri");
@ -963,7 +963,7 @@ sub phase3_cleanup {
die "Failed to complete storage migration: $err\n"; die "Failed to complete storage migration: $err\n";
} else { } else {
foreach my $target_drive (keys %{$self->{target_drive}}) { foreach my $target_drive (keys %{$self->{target_drive}}) {
my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{volid}); my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{drivestr});
$conf->{$target_drive} = PVE::QemuServer::print_drive($drive); $conf->{$target_drive} = PVE::QemuServer::print_drive($drive);
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
} }

4
PVE/QemuServer.pm
View File

@ -5444,10 +5444,10 @@ sub vm_start {
$localip = "[$localip]" if Net::IP::ip_is_ipv6($localip); $localip = "[$localip]" if Net::IP::ip_is_ipv6($localip);
foreach my $opt (sort keys %$local_volumes) { foreach my $opt (sort keys %$local_volumes) {
my $volid = $local_volumes->{$opt}; my $drivestr = $local_volumes->{$opt};
mon_cmd($vmid, "nbd-server-add", device => "drive-$opt", writable => JSON::true ); mon_cmd($vmid, "nbd-server-add", device => "drive-$opt", writable => JSON::true );
my $migrate_storage_uri = "nbd:${localip}:${storage_migrate_port}:exportname=drive-$opt"; my $migrate_storage_uri = "nbd:${localip}:${storage_migrate_port}:exportname=drive-$opt";
print "storage migration listens on $migrate_storage_uri volume:$volid\n"; print "storage migration listens on $migrate_storage_uri volume:$drivestr\n";
} }
} }