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

migration: avoid re-scanning all volumes

Browse Source 
by using the information obtained in the first scan. This
also makes sure we only scan local storages.

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

7
PVE/QemuMigrate.pm
View File

@ -415,6 +415,7 @@ sub scan_local_volumes {
my ($volid, $sid, $volinfo) = @_; my ($volid, $sid, $volinfo) = @_;
$local_volumes->{$volid}->{ref} = 'storage'; $local_volumes->{$volid}->{ref} = 'storage';
$local_volumes->{$volid}->{size} = $volinfo->{size};
# If with_snapshots is not set for storage migrate, it tries to use # If with_snapshots is not set for storage migrate, it tries to use
# a raw+size stream, but on-the-fly conversion from qcow2 to raw+size # a raw+size stream, but on-the-fly conversion from qcow2 to raw+size
@ -587,17 +588,15 @@ sub scan_local_volumes {
} }
# sizes in config have to be accurate for remote node to correctly # sizes in config have to be accurate for remote node to correctly
# allocate disks, rescan to be sure # allocate disks
my $volid_hash = PVE::QemuServer::scan_volids($storecfg, $vmid);
PVE::QemuConfig->foreach_volume($conf, sub { PVE::QemuConfig->foreach_volume($conf, sub {
my ($key, $drive) = @_; my ($key, $drive) = @_;
return if $key eq 'efidisk0'; # skip efidisk, will be handled later return if $key eq 'efidisk0'; # skip efidisk, will be handled later
my $volid = $drive->{file}; my $volid = $drive->{file};
return if !defined($local_volumes->{$volid}); # only update sizes for local volumes return if !defined($local_volumes->{$volid}); # only update sizes for local volumes
return if !defined($volid_hash->{$volid});
my ($updated, $msg) = PVE::QemuServer::Drive::update_disksize($drive, $volid_hash->{$volid}->{size}); my ($updated, $msg) = PVE::QemuServer::Drive::update_disksize($drive, $local_volumes->{$volid}->{size});
if (defined($updated)) { if (defined($updated)) {
$conf->{$key} = PVE::QemuServer::print_drive($updated); $conf->{$key} = PVE::QemuServer::print_drive($updated);
$self->log('info', "drive '$key': $msg"); $self->log('info', "drive '$key': $msg");