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

add new helper to calculate timeout based on vm config

Browse Source 
Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx 2020-01-14 14:30:36 +01:00 committed by Thomas Lamprecht
parent 52cffab6b5
commit 2f18c84dc7
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/QemuServer.pm
View File

@ -41,7 +41,7 @@ use PVE::Tools qw(run_command lock_file lock_file_full file_read_firstline file_
use PVE::QMPClient; use PVE::QMPClient;
use PVE::QemuConfig; use PVE::QemuConfig;
use PVE::QemuServer::Helpers qw(min_version); use PVE::QemuServer::Helpers qw(min_version config_aware_timeout);
use PVE::QemuServer::Cloudinit; use PVE::QemuServer::Cloudinit;
use PVE::QemuServer::Machine; use PVE::QemuServer::Machine;
use PVE::QemuServer::Memory; use PVE::QemuServer::Memory;
@ -5541,7 +5541,7 @@ sub vm_start {
my $cpuunits = defined($conf->{cpuunits}) ? $conf->{cpuunits} my $cpuunits = defined($conf->{cpuunits}) ? $conf->{cpuunits}
: $defaults->{cpuunits}; : $defaults->{cpuunits};
my $start_timeout = ($conf->{hugepages} || $is_suspended) ? 300 : 30; my $start_timeout = config_aware_timeout($conf, $is_suspended);
my %run_params = ( my %run_params = (
timeout => $statefile ? undef : $start_timeout, timeout => $statefile ? undef : $start_timeout,
umask => 0077, umask => 0077,

22
PVE/QemuServer/Helpers.pm
View File

@ -11,6 +11,7 @@ use PVE::ProcFSTools;
use base 'Exporter'; use base 'Exporter';
our @EXPORT_OK = qw( our @EXPORT_OK = qw(
min_version min_version
config_aware_timeout
); );
my $nodename = PVE::INotify::nodename(); my $nodename = PVE::INotify::nodename();
@ -139,4 +140,25 @@ sub version_cmp {
return 0; return 0;
} }
sub config_aware_timeout {
my ($config, $is_suspended) = @_;
my $memory = $config->{memory};
my $timeout = 30;
# Based on user reported startup time for vm with 512GiB @ 4-5 minutes
if (defined($memory) && $memory > 30720) {
$timeout = int($memory/1024);
}
if ($is_suspended && $timeout < 300) {
$timeout = 300;
}
if ($config->{hugepages} && $timeout < 150) {
$timeout = 150;
}
return $timeout;
}
1; 1;