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 9602591A38 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 7C5C131805 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) server-digest SHA256) (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 395B84935A for ; Tue, 30 Jan 2024 18:11:28 +0100 (CET) From: Friedrich Weber To: pve-devel@lists.proxmox.com Date: Tue, 30 Jan 2024 18:10:52 +0100 Message-Id: <20240130171057.438025-2-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.095 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 guest-common v2 1/6] guest helpers: add helper to overrule active tasks of a specific type 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:11:59 -0000 This helper is used to abort any active qmshutdown/vzshutdown tasks before attempting to stop a VM/CT (if requested). Signed-off-by: Friedrich Weber --- Notes: no changes v1 -> v2 src/PVE/GuestHelpers.pm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/PVE/GuestHelpers.pm b/src/PVE/GuestHelpers.pm index 961a7b8..bd94ed2 100644 --- a/src/PVE/GuestHelpers.pm +++ b/src/PVE/GuestHelpers.pm @@ -416,4 +416,22 @@ sub check_vnet_access { if !($tag || $trunks); } +sub overrule_tasks { + my ($type, $user, $vmid) = @_; + + my $active_tasks = PVE::INotify::read_file('active'); + my $res = []; + for my $task (@$active_tasks) { + if (!$task->{saved} + && $task->{type} eq $type + && $task->{user} eq $user + && $task->{id} eq $vmid + ) { + PVE::RPCEnvironment->check_worker($task->{upid}, 1); + push @$res, $task->{upid}; + } + } + return $res; +} + 1; -- 2.39.2