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 499DE958EA for ; Fri, 12 Apr 2024 16:16:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2EB9EBC0E for ; Fri, 12 Apr 2024 16:16:50 +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, 12 Apr 2024 16:16:48 +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 AA307450B4 for ; Fri, 12 Apr 2024 16:16:48 +0200 (CEST) From: Friedrich Weber To: pve-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 16:15:50 +0200 Message-Id: <20240412141553.430554-3-f.weber@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240412141553.430554-1-f.weber@proxmox.com> References: <20240412141553.430554-1-f.weber@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.067 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.pm] Subject: [pve-devel] [PATCH container v3 2/5] fix #4474: lxc 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: Fri, 12 Apr 2024 14:16:50 -0000 The new `overrule-shutdown` parameter is boolean and defaults to 0. If it is 1, all active `vzshutdown` tasks for the same CT (which are visible to the user/token) are aborted before attempting to stop the CT. Passing `overrule-shutdown=1` is forbidden for HA resources. Signed-off-by: Friedrich Weber --- Notes: changes v2 -> v3: - avoid printing empty list of overruled tasks - rephrased parameter description/commit to reflect changed logic - adapt to rename to `abort_guest_tasks` changes v1 -> v2: - move overrule code into worker, as suggested by Wolfgang - print to worker stdout instead of syslog src/PVE/API2/LXC/Status.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/PVE/API2/LXC/Status.pm b/src/PVE/API2/LXC/Status.pm index 7741374..08e23b6 100644 --- a/src/PVE/API2/LXC/Status.pm +++ b/src/PVE/API2/LXC/Status.pm @@ -220,6 +220,12 @@ __PACKAGE__->register_method({ node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid_running }), skiplock => get_standard_option('skiplock'), + 'overrule-shutdown' => { + description => "Abort any active and visible 'vzshutdown' tasks before stopping", + optional => 1, + type => 'boolean', + default => 0, + } }, }, returns => { @@ -237,10 +243,15 @@ __PACKAGE__->register_method({ raise_param_exc({ skiplock => "Only root may use this option." }) if $skiplock && $authuser ne 'root@pam'; + my $overrule_shutdown = extract_param($param, 'overrule-shutdown'); + die "CT $vmid not running\n" if !PVE::LXC::check_running($vmid); if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') { + raise_param_exc({ 'overrule-shutdown' => "Not applicable for HA resources." }) + if $overrule_shutdown; + my $hacmd = sub { my $upid = shift; @@ -257,6 +268,14 @@ __PACKAGE__->register_method({ my $realcmd = sub { my $upid = shift; + if ($overrule_shutdown) { + my $overruled_tasks = PVE::GuestHelpers::abort_guest_tasks( + $rpcenv, 'vzshutdown', $vmid); + my $overruled_tasks_list = join(", ", $overruled_tasks->@*); + print "overruled vzshutdown tasks: $overruled_tasks_list\n" + if @$overruled_tasks; + }; + PVE::LXC::Config->lock_config($vmid, sub { syslog('info', "stopping CT $vmid: $upid\n"); -- 2.39.2