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 E9E6891A3A for ; Tue, 30 Jan 2024 18:11:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CC4F6317BC for ; Tue, 30 Jan 2024 18:11:29 +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 ; Tue, 30 Jan 2024 18:11:28 +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 867DD49355 for ; Tue, 30 Jan 2024 18:11:28 +0100 (CET) From: Friedrich Weber To: pve-devel@lists.proxmox.com Cc: Wolfgang Bumiller Date: Tue, 30 Jan 2024 18:10:55 +0100 Message-Id: <20240130171057.438025-5-f.weber@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240130171057.438025-1-f.weber@proxmox.com> References: <20240130171057.438025-1-f.weber@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.094 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server v2 4/6] fix #4474: qemu api: add overrule-shutdown parameter to stop endpoint 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: Tue, 30 Jan 2024 17:12:00 -0000 The new `overrule-shutdown` parameter is boolean and defaults to 0. If it is 1, all active `qmshutdown` tasks by the current user for the same VM are aborted before attempting to stop the VM. Passing `overrule-shutdown=1` is forbidden for HA resources. Acked-by: Wolfgang Bumiller Signed-off-by: Friedrich Weber --- Notes: no changes v1 -> v2 PVE/API2/Qemu.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index cdc8f7a..e6a7657 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -2964,7 +2964,13 @@ __PACKAGE__->register_method({ type => 'boolean', optional => 1, default => 0, - } + }, + 'overrule-shutdown' => { + description => "Abort any active 'qmshutdown' task by the current user for this VM before stopping", + optional => 1, + type => 'boolean', + default => 0, + }, }, }, returns => { @@ -2991,10 +2997,13 @@ __PACKAGE__->register_method({ raise_param_exc({ migratedfrom => "Only root may use this option." }) if $migratedfrom && $authuser ne 'root@pam'; + my $overrule_shutdown = extract_param($param, 'overrule-shutdown'); my $storecfg = PVE::Storage::config(); if (PVE::HA::Config::vm_is_ha_managed($vmid) && ($rpcenv->{type} ne 'ha') && !defined($migratedfrom)) { + raise_param_exc({ 'overrule-shutdown' => "Not applicable for HA resources." }) + if $overrule_shutdown; my $hacmd = sub { my $upid = shift; @@ -3014,6 +3023,11 @@ __PACKAGE__->register_method({ syslog('info', "stop VM $vmid: $upid\n"); + if ($overrule_shutdown) { + my $overruled_tasks = PVE::GuestHelpers::overrule_tasks('qmshutdown', $authuser, $vmid); + print "overruled qmshutdown tasks: " . join(", ", $overruled_tasks->@*) . "\n"; + }; + PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0, $param->{timeout}, 0, 1, $keepActive, $migratedfrom); return; -- 2.39.2