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 E44DF98761 for ; Wed, 15 Nov 2023 15:22:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DBFB9790F for ; Wed, 15 Nov 2023 15:22:25 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (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 ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 07400D9AF; Wed, 15 Nov 2023 15:22:10 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 061A6187E51; Wed, 15 Nov 2023 15:22:10 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 15:22:04 +0100 Message-Id: <20231115142208.563587-12-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115142208.563587-1-aderumier@odiso.com> References: <20231115142208.563587-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - T_SPF_HELO_TEMPERROR 0.01 SPF: test of HELO record failed (temperror) Subject: [pve-devel] [PATCH pve-container 4/6] vm_clone : create ips in ipams 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: Wed, 15 Nov 2023 14:22:26 -0000 also delete ips in case of failure Signed-off-by: Alexandre Derumier --- src/PVE/API2/LXC.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index ccacbd2..f18d23b 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -1830,7 +1830,9 @@ __PACKAGE__->register_method({ $lock_and_reload->($newid, sub { my $conf = shift; my $rootdir = PVE::LXC::mount_all($newid, $storecfg, $conf, 1); + eval { + PVE::LXC::create_ifaces_ipams_ips($conf, $vmid); my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); $lxc_setup->post_clone_hook($conf); }; @@ -1850,7 +1852,7 @@ __PACKAGE__->register_method({ warn $@ if $@; if ($err) { - # Now cleanup the config & disks: + # Now cleanup the config & disks & ipam: sleep 1; # some storages like rbd need to wait before release volume - really? foreach my $volid (@$newvollist) { @@ -1860,6 +1862,8 @@ __PACKAGE__->register_method({ eval { $lock_and_reload->($newid, sub { + my $conf = shift; + PVE::LXC::delete_ifaces_ipams_ips($conf, $newid); PVE::LXC::Config->destroy_config($newid); PVE::Firewall::remove_vmfw_conf($newid); }); -- 2.39.2