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 1A829738C9 for ; Fri, 18 Jun 2021 14:51:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 172E4279E7 for ; Fri, 18 Jun 2021 14:51:50 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E92EE279DA for ; Fri, 18 Jun 2021 14:51:48 +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 C3C0644207 for ; Fri, 18 Jun 2021 14:51:48 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 14:51:23 +0200 Message-Id: <20210618125123.2903137-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210618125123.2903137-1-f.gruenbichler@proxmox.com> References: <20210617105201.804786-1-o.bektas@proxmox.com> <20210618125123.2903137-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.711 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. [lxc.pm] Subject: [pve-devel] [PATCH container 6/6] clone_vm: rework firewall config cloning 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, 18 Jun 2021 12:51:50 -0000 we need to clone the firewall config before doing any actual work, else we risk partially aborting and leaving a non-firewalled container around. accordingly, we need to (attempt to) remove the cloned FW config after successfully removing the guest config in error handling. partially reverts/fixes 4925b86a920a862f25f0d93d243ce099c922979d clone_vm: improve config locking Signed-off-by: Fabian Grünbichler --- src/PVE/API2/LXC.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 4877dd9..0d4d91a 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -1394,6 +1394,7 @@ __PACKAGE__->register_method({ my $running; PVE::LXC::Config->create_and_lock_config($newid, 0); + PVE::Firewall::clone_vmfw_conf($vmid, $newid); my $lock_and_reload = sub { my ($vmid, $code) = @_; @@ -1502,6 +1503,7 @@ __PACKAGE__->register_method({ eval { $lock_and_reload->($newid, sub { PVE::LXC::Config->destroy_config($newid); + PVE::Firewall::remove_vmfw_conf($newid); }); }; warn "Failed to remove target CT config - $@\n" if $@; @@ -1593,6 +1595,7 @@ __PACKAGE__->register_method({ eval { $lock_and_reload->($newid, sub { PVE::LXC::Config->destroy_config($newid); + PVE::Firewall::remove_vmfw_conf($newid); }); }; warn "Failed to remove target CT config - $@\n" if $@; @@ -1612,7 +1615,6 @@ __PACKAGE__->register_method({ } }); - PVE::Firewall::clone_vmfw_conf($vmid, $newid); return; }; -- 2.30.2