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 321247359A for ; Tue, 6 Jul 2021 11:45:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2821B27A89 for ; Tue, 6 Jul 2021 11:45:00 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 5520427A7E for ; Tue, 6 Jul 2021 11:44:59 +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 2CA7240C73 for ; Tue, 6 Jul 2021 11:44:59 +0200 (CEST) Date: Tue, 6 Jul 2021 11:44:55 +0200 From: Oguz Bektas To: Fabian =?iso-8859-1?Q?Gr=FCnbichler?= Cc: Proxmox VE development discussion Message-ID: Mail-Followup-To: Oguz Bektas , Fabian =?iso-8859-1?Q?Gr=FCnbichler?= , Proxmox VE development discussion References: <20210705220230.518658-1-aderumier@odiso.com> <1625558731.pqpqnm9nzg.astroid@nora.none> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1625558731.pqpqnm9nzg.astroid@nora.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 1.629 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 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. [qemu.pm, proxmox.com] Subject: Re: [pve-devel] [PATCH qemu-server] api2: fix vmconfig_apply_pending errors handling 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, 06 Jul 2021 09:45:00 -0000 hi, true, it seems that parameter was leftover! thanks for noticing that. now i tested alexandre's patch. when i have a pending change that cannot be applied, the appropriate error message is returned (unable to apply pending change: foo) and the it stays in [PENDING] section of config. Tested-by: Oguz Bektas On Tue, Jul 06, 2021 at 10:10:23AM +0200, Fabian Grünbichler wrote: > On July 6, 2021 12:02 am, Alexandre Derumier wrote: > > commit > > https://git.proxmox.com/?p=qemu-server.git;a=commit;h=eb5e482ded9ae6aeb6575de9441b79b90a5de531 > > > > have introduced error handling for offline pending apply, > > > > - PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $running); > > + PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $running, $errors); > > > > sub vmconfig_apply_pending { > > - my ($vmid, $conf, $storecfg) = @_; > > + my ($vmid, $conf, $storecfg, $errors) = @_; > > > > but they was wrong nonused $running param, so currently $errors are not correctly handled > > $running was indeed not used since the introduction of hotplug > functionality in 2015 - but this also means that half of that commit was > not actually tested (@Oguz - please take another look and confirm it > works as expected WITH this patch here). > > errors should still be handled "correctly" without this patch (as in, > mostly not ;)), the main difference is whether changing the config > returns a proper error or not when applying pending changes fails. > > > > > Signed-off-by: Alexandre Derumier > > --- > > PVE/API2/Qemu.pm | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > > index 1e540f5..f2557e3 100644 > > --- a/PVE/API2/Qemu.pm > > +++ b/PVE/API2/Qemu.pm > > @@ -1413,7 +1413,7 @@ my $update_vm_api = sub { > > if ($running) { > > PVE::QemuServer::vmconfig_hotplug_pending($vmid, $conf, $storecfg, $modified, $errors); > > } else { > > - PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $running, $errors); > > + PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $errors); > > } > > raise_param_exc($errors) if scalar(keys %$errors); > > > > -- > > 2.20.1 > > > > > > _______________________________________________ > > pve-devel mailing list > > pve-devel@lists.proxmox.com > > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > > > >