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 879999A407 for ; Fri, 17 Nov 2023 12:40:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0792230CB5 for ; Fri, 17 Nov 2023 12:40:26 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 17 Nov 2023 12:40:24 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id E579A2C392B; Fri, 17 Nov 2023 12:40:18 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 12:40:08 +0100 Message-Id: <20231117114011.834002-31-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231117114011.834002-1-s.hanreich@proxmox.com> References: <20231117114011.834002-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.460 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 pve-container 30/33] 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: Fri, 17 Nov 2023 11:40:58 -0000 From: Alexandre Derumier 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 e15de28..ee4fdca 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