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 B86C39A820 for ; Fri, 17 Nov 2023 14:12:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9351433219 for ; Fri, 17 Nov 2023 14:12:27 +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 ; Fri, 17 Nov 2023 14:12:26 +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 9897343DF0 for ; Fri, 17 Nov 2023 14:12:26 +0100 (CET) Date: Fri, 17 Nov 2023 14:12:25 +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-4-f.weber@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230126083214.711099-4-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 - Subject: Re: [pve-devel] [RFC qemu-server 3/4] 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: Fri, 17 Nov 2023 13:12:57 -0000 This one LGTM. On Thu, Jan 26, 2023 at 09:32:13AM +0100, Friedrich Weber wrote: > 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. > > Signed-off-by: Friedrich Weber Acked-by: Wolfgang Bumiller > --- > 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 c87602d..b253e1f 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -2799,7 +2799,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 => { > @@ -2826,10 +2832,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; > @@ -2849,6 +2858,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.30.2