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

Revert "migration: do not set default speed limit"

Browse Source 
The default was changed for 5.2, so while it is not 32 MiB/s anymore,
it is still 128 MiB/s which I did not notice on my 1 Gbps (or < 125
MiB/s) setup. For users with links faster than one gigabit it now did
some limiting - so setup a very high limit so than even 100G should
not max this out.

This reverts commit a89bd10084.
This commit is contained in:
Thomas Lamprecht 2021-04-29 14:27:41 +02:00
parent ba2a06fda2
commit 8f43ac4893
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuMigrate.pm
View File

@ -966,8 +966,7 @@ sub phase2 {
# migrate_speed parameter in qm.conf - take the lower of the two.
my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', undef, $self->{opts}->{bwlimit}) // 0;
my $migrate_speed = $conf->{migrate_speed} // 0;
# migrate_speed is in MB/s, bwlimit in KB/s
$migrate_speed *= 1024;
$migrate_speed *= 1024; # migrate_speed is in MB/s, bwlimit in KB/s
if ($bwlimit && $migrate_speed) {
$migrate_speed = ($bwlimit < $migrate_speed) ? $bwlimit : $migrate_speed;
@ -979,8 +978,11 @@ sub phase2 {
if ($migrate_speed) {
$migrate_speed *= 1024; # qmp takes migrate_speed in B/s.
$self->log('info', "migration speed limit: ". render_bytes($migrate_speed, 1) ."/s");
$qemu_migrate_params->{'max-bandwidth'} = int($migrate_speed);
} else {
# always set migrate speed as QEMU default to 128 MiBps == 1 Gbps, use 16 GiBps == 128 Gbps
$migrate_speed = (16 << 30);
}
$qemu_migrate_params->{'max-bandwidth'} = int($migrate_speed);
my $migrate_downtime = $defaults->{migrate_downtime};
$migrate_downtime = $conf->{migrate_downtime} if defined($conf->{migrate_downtime});