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 608799A7B3 for ; Fri, 17 Nov 2023 13:54:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3BA7933004 for ; Fri, 17 Nov 2023 13:53:53 +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 ; Fri, 17 Nov 2023 13:53:52 +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 82BEE43DFB for ; Fri, 17 Nov 2023 13:53:52 +0100 (CET) Date: Fri, 17 Nov 2023 13:53:51 +0100 From: Wolfgang Bumiller To: Friedrich Weber Cc: pve-devel@lists.proxmox.com Message-ID: References: <20230126083214.711099-1-f.weber@proxmox.com> <20230126083214.711099-5-f.weber@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230126083214.711099-5-f.weber@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.100 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 - 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: Re: [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: Fri, 17 Nov 2023 12:54:23 -0000 Patch itself LGTM, just a note on sending patch series in general: If you number patches throughout a whole series rather than the individual repositories (as in, this one is labeled 4/4 instead of 1/1), it would be nice if the order also helps determine dependencies. Since the sub introduced here is used in 2/4 and 3/4, it doesn't make sense for this to come last. `qemu-server` and `container` will both want their guest-common dependency bumped to the version which includes this patch. On Thu, Jan 26, 2023 at 09:32:14AM +0100, Friedrich Weber wrote: > 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