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 DF42096A63 for ; Thu, 26 Jan 2023 09:33:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8213920230 for ; Thu, 26 Jan 2023 09:32:59 +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 ; Thu, 26 Jan 2023 09:32:57 +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 A358E46589 for ; Thu, 26 Jan 2023 09:32:55 +0100 (CET) From: Friedrich Weber To: pve-devel@lists.proxmox.com Date: Thu, 26 Jan 2023 09:32:14 +0100 Message-Id: <20230126083214.711099-5-f.weber@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126083214.711099-1-f.weber@proxmox.com> References: <20230126083214.711099-1-f.weber@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.803 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 RCVD_IN_DNSWL_HI -5 Sender listed at https://www.dnswl.org/, high trust 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. [guesthelpers.pm] Subject: [pve-devel] [RFC guest-common 4/4] 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: Thu, 26 Jan 2023 08:33:29 -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 --- src/PVE/GuestHelpers.pm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/PVE/GuestHelpers.pm b/src/PVE/GuestHelpers.pm index b4ccbaa..3cdf5d7 100644 --- a/src/PVE/GuestHelpers.pm +++ b/src/PVE/GuestHelpers.pm @@ -366,4 +366,22 @@ sub get_unique_tags { return !$no_join_result ? join(';', $res->@*) : $res; } +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.30.2