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

migration: save targetstorage and bwlimit in local_volumes hash and re-use information

Browse Source 
It is enough to call get_bandwith_limit once for each source_storage.

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

27
PVE/QemuMigrate.pm
View File

@ -411,11 +411,19 @@ sub scan_local_volumes {
if !$target_scfg->{content}->{images}; if !$target_scfg->{content}->{images};
} }
my $bwlimit = PVE::Storage::get_bandwidth_limit(
'migration',
[$targetsid, $storeid],
$self->{opts}->{bwlimit},
);
PVE::Storage::foreach_volid($dl, sub { PVE::Storage::foreach_volid($dl, sub {
my ($volid, $sid, $volinfo) = @_; my ($volid, $sid, $volinfo) = @_;
$local_volumes->{$volid}->{ref} = 'storage'; $local_volumes->{$volid}->{ref} = 'storage';
$local_volumes->{$volid}->{size} = $volinfo->{size}; $local_volumes->{$volid}->{size} = $volinfo->{size};
$local_volumes->{$volid}->{targetsid} = $targetsid;
$local_volumes->{$volid}->{bwlimit} = $bwlimit;
# 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
@ -659,12 +667,9 @@ sub sync_offline_local_volumes {
$self->log('info', "copying local disk images") if scalar(@volids); $self->log('info', "copying local disk images") if scalar(@volids);
foreach my $volid (@volids) { foreach my $volid (@volids) {
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); my $targetsid = $local_volumes->{$volid}->{targetsid};
my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); my $bwlimit = $local_volumes->{$volid}->{bwlimit};
# use 'migration' limit for transfer to other node $bwlimit = $bwlimit * 1024 if defined($bwlimit); # storage_migrate uses bps
my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', [$targetsid, $sid], $opts->{bwlimit});
# JSONSchema and get_bandwidth_limit use kbps - storage_migrate bps
$bwlimit = $bwlimit * 1024 if defined($bwlimit);
my $storage_migrate_opts = { my $storage_migrate_opts = {
'ratelimit_bps' => $bwlimit, 'ratelimit_bps' => $bwlimit,
@ -777,6 +782,7 @@ sub phase2 {
my ($self, $vmid) = @_; my ($self, $vmid) = @_;
my $conf = $self->{vmconf}; my $conf = $self->{vmconf};
my $local_volumes = $self->{local_volumes};
$self->log('info', "starting VM $vmid on remote node '$self->{node}'"); $self->log('info', "starting VM $vmid on remote node '$self->{node}'");
@ -911,8 +917,6 @@ sub phase2 {
my $start = time(); my $start = time();
my $opt_bwlimit = $self->{opts}->{bwlimit};
if (defined($self->{online_local_volumes})) { if (defined($self->{online_local_volumes})) {
$self->{storage_migration} = 1; $self->{storage_migration} = 1;
$self->{storage_migration_jobs} = {}; $self->{storage_migration_jobs} = {};
@ -930,10 +934,7 @@ sub phase2 {
my $source_volid = $source_drive->{file}; my $source_volid = $source_drive->{file};
my $target_volid = $target_drive->{file}; my $target_volid = $target_drive->{file};
my $source_sid = PVE::Storage::Plugin::parse_volume_id($source_volid); my $bwlimit = $local_volumes->{$source_volid}->{bwlimit};
my $target_sid = PVE::Storage::Plugin::parse_volume_id($target_volid);
my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', [$source_sid, $target_sid], $opt_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");
@ -960,7 +961,7 @@ sub phase2 {
# migrate speed can be set via bwlimit (datacenter.cfg and API) and via the # migrate speed can be set via bwlimit (datacenter.cfg and API) and via the
# migrate_speed parameter in qm.conf - take the lower of the two. # migrate_speed parameter in qm.conf - take the lower of the two.
my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', undef, $opt_bwlimit) // 0; my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', undef, $self->{opts}->{bwlimit}) // 0;
my $migrate_speed = $conf->{migrate_speed} // 0; my $migrate_speed = $conf->{migrate_speed} // 0;
# migrate_speed is in MB/s, bwlimit in KB/s # migrate_speed is in MB/s, bwlimit in KB/s
$migrate_speed *= 1024; $migrate_speed *= 1024;