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 2C9737350C for ; Tue, 6 Jul 2021 10:10:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 229A6266E1 for ; Tue, 6 Jul 2021 10:10:40 +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 1E539266D3 for ; Tue, 6 Jul 2021 10:10:39 +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 DB88F40C0B for ; Tue, 6 Jul 2021 10:10:32 +0200 (CEST) Date: Tue, 06 Jul 2021 10:10:23 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210705220230.518658-1-aderumier@odiso.com> In-Reply-To: <20210705220230.518658-1-aderumier@odiso.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1625558731.pqpqnm9nzg.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.546 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 08:10:40 -0000 On July 6, 2021 12:02 am, Alexandre Derumier wrote: > commit > https://git.proxmox.com/?p=3Dqemu-server.git;a=3Dcommit;h=3Deb5e482ded9ae= 6aeb6575de9441b79b90a5de531 >=20 > have introduced error handling for offline pending apply, >=20 > - PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $st= orecfg, $running); > + PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $st= orecfg, $running, $errors); >=20 > sub vmconfig_apply_pending { > - my ($vmid, $conf, $storecfg) =3D @_; > + my ($vmid, $conf, $storecfg, $errors) =3D @_; >=20 > but they was wrong nonused $running param, so currently $errors are not c= orrectly handled $running was indeed not used since the introduction of hotplug=20 functionality in 2015 - but this also means that half of that commit was=20 not actually tested (@Oguz - please take another look and confirm it=20 works as expected WITH this patch here). errors should still be handled "correctly" without this patch (as in,=20 mostly not ;)), the main difference is whether changing the config=20 returns a proper error or not when applying pending changes fails. >=20 > Signed-off-by: Alexandre Derumier > --- > PVE/API2/Qemu.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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 =3D sub { > if ($running) { > PVE::QemuServer::vmconfig_hotplug_pending($vmid, $conf, $storecfg, $mo= dified, $errors); > } else { > - PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $runn= ing, $errors); > + PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $erro= rs); > } > raise_param_exc($errors) if scalar(keys %$errors); > =20 > --=20 > 2.20.1 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20