From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C5717F6C7 for ; Fri, 16 Dec 2022 14:39:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A5CCB226B6 for ; Fri, 16 Dec 2022 14:39:06 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 16 Dec 2022 14:39:05 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8FDA543A90 for ; Fri, 16 Dec 2022 14:39:05 +0100 (CET) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Fri, 16 Dec 2022 14:36:52 +0100 Message-Id: <20221216133655.510957-3-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216133655.510957-1-d.tschlatscher@proxmox.com> References: <20221216133655.510957-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.116 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemu.pm, helpers.pm, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server v3 2/5] expose VM start timeout config setting in API X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2022 13:39:36 -0000 This patch makes it possible to now set the starting timeout value for a VM via the config parameter 'startoptions'. Now, if the timeout parameter is set, it will override the heuristic calculation of the VM start timeout. The maximum value for the timeout parameter is 86400 seconds, which is one day. The minimum value is 0, which disables the timeout. Signed-off-by: Daniel Tschlatscher --- Changes from v2: * No changes PVE/API2/Qemu.pm | 2 ++ PVE/QemuServer.pm | 1 + PVE/QemuServer/Helpers.pm | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index badfc37..8375ab9 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -541,6 +541,7 @@ my $generaloptions = { 'reboot' => 1, 'startdate' => 1, 'startup' => 1, + 'startoptions' => 1, 'tdf' => 1, 'template' => 1, }; @@ -2647,6 +2648,7 @@ __PACKAGE__->register_method({ description => "Wait maximal timeout seconds.", type => 'integer', minimum => 0, + maximum => 86400, default => 'max(30, vm memory in GiB)', optional => 1, }, diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a746b3d..2adbe3a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -716,6 +716,7 @@ EODESCR description => "List of host cores used to execute guest processes, for example: 0,5,8-11", optional => 1, }, + startoptions => get_standard_option('start-options'), }; my $cicustom_fmt = { diff --git a/PVE/QemuServer/Helpers.pm b/PVE/QemuServer/Helpers.pm index e91f906..1fa9011 100644 --- a/PVE/QemuServer/Helpers.pm +++ b/PVE/QemuServer/Helpers.pm @@ -144,6 +144,10 @@ sub version_cmp { sub config_aware_timeout { my ($config, $is_suspended) = @_; + + my $startup = PVE::JSONSchema::pve_parse_startup_options($config->{startoptions}); + return $startup->{timeout} if defined($startup->{timeout}); + my $memory = $config->{memory}; my $timeout = 30; -- 2.30.2