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 33FDA70748 for ; Fri, 22 Jul 2022 15:28:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 29CEA3E15 for ; Fri, 22 Jul 2022 15:28:00 +0200 (CEST) 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, 22 Jul 2022 15:27:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 34DBA43BE0 for ; Fri, 22 Jul 2022 15:27:58 +0200 (CEST) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Fri, 22 Jul 2022 15:27:34 +0200 Message-Id: <20220722132738.397449-1-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.100 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 Subject: [pve-devel] [PATCH common v2 1/4] fix #3502: VM start timeout config parameter 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, 22 Jul 2022 13:28:30 -0000 This allows setting the 'startoptions' property string in the config. For now this only implements the 'timeout' parameter but should be rather easily extensible and allow related VM start config options to be also configurable here. Signed-off-by: Daniel Tschlatscher --- Changes from v1: * This is now a property string instead of a simple parameter to make it more "future-proof" * Maximum timeout reduced to 86400 * Revised description I did not include the timeout property under the existing "startup" property string because, while it is a similar feature, it is not inherently associated with the "startup/shutdown order" functionality. Also, this makes it more easily extensible for all start-options that might be added in the future. Still, as having "startup" and "startoptions" could be confusing for some, I am open for suggestions on this! src/PVE/JSONSchema.pm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index ab718f3..adabb8e 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -633,6 +633,17 @@ sub pve_verify_startup_order { die "unable to parse startup options\n"; } +register_format('start-options', \&pve_verify_startup_options); +sub pve_verify_startup_options { + my ($value, $noerr) = @_; + + return $value if pve_parse_startup_options($value); + + return undef if $noerr; + + die "unable to parse vm start options\n"; +} + my %bwlimit_opt = ( optional => 1, type => 'number', minimum => '0', @@ -739,6 +750,33 @@ PVE::JSONSchema::register_standard_option('pve-startup-order', { typetext => '[[order=]\d+] [,up=\d+] [,down=\d+] ', }); +sub pve_parse_startup_options { + my ($value) = @_; + + return undef if !$value; + + my $res = {}; + + foreach my $p (split(/,/, $value)) { + next if $p =~ m/^\s*$/; + + if ($p =~ m/^timeout=(\d+)$/ && int($1) <= 86400) { + $res->{timeout} = $1; + } else { + return undef; + } + } + + return $res; +} + +register_standard_option('start-options', { + description => "Start up options for the VM. This only allows setting the VM start timeout for now, which is the maximum VM startup timeout in seconds. The maximum value for timeout is 86400, the minimum 0, which disables the timeout. If timeout is unset, the timeout will either be the memory of the VM in GiBs or 30, depending on which is greater. If unset and hibernated, the value will at least be 300 seconds, with hugepages at least 150 seconds.", + optional => 1, + type => 'string', format => 'start-options', + typetext => 'timeout=\d+', +}); + register_format('pve-tfa-secret', \&pve_verify_tfa_secret); sub pve_verify_tfa_secret { my ($key, $noerr) = @_; -- 2.30.2