From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 3E6911FF13A for ; Wed, 22 Jul 2026 16:03:00 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id CFF17214E7; Wed, 22 Jul 2026 16:02:59 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 2/7] vm_stop: introduce config_aware_shutdown_timeout helper Date: Wed, 22 Jul 2026 16:01:44 +0200 Message-ID: <20260722140149.296952-3-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260722140149.296952-1-d.kral@proxmox.com> References: <20260722140149.296952-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784728917820 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.246 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: JST4FVJGEH6ICXOLDYMTWQ3CDFUCKCH7 X-Message-ID-Hash: JST4FVJGEH6ICXOLDYMTWQ3CDFUCKCH7 X-MailFrom: d.kral@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Factor out the parsing of the shutdown timeout from the VM config in preparation of a patch, which makes the shutdown timeout of HA resources consistent with non-HA resources. Signed-off-by: Daniel Kral --- src/PVE/QemuServer.pm | 5 +---- src/PVE/QemuServer/Helpers.pm | 13 +++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 5b9f5753..fefaf36c 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -6241,10 +6241,7 @@ sub _do_vm_stop { if (!$nocheck) { $conf = PVE::QemuConfig->load_config($vmid); PVE::QemuConfig->check_lock($conf) if !$skiplock; - if (!defined($timeout) && $shutdown && $conf->{startup}) { - my $opts = PVE::JSONSchema::pve_parse_startup_order($conf->{startup}); - $timeout = $opts->{down} if $opts->{down}; - } + $timeout //= PVE::QemuServer::Helpers::config_aware_shutdown_timeout($conf) if $shutdown; PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-stop'); } diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index de9bc098..81e42854 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -297,6 +297,19 @@ sub config_aware_start_timeout { return $timeout; } +sub config_aware_shutdown_timeout { + my ($conf) = @_; + + my $timeout = 60; + + if ($conf->{startup}) { + my $opts = PVE::JSONSchema::pve_parse_startup_order($conf->{startup}); + $timeout = $opts->{down} if $opts->{down}; + } + + return $timeout; +} + sub get_node_pvecfg_version { my ($node) = @_; -- 2.47.3