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 02B5A738C0 for ; Fri, 18 Jun 2021 14:51:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F23E927921 for ; Fri, 18 Jun 2021 14:51:35 +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 6ED5427916 for ; Fri, 18 Jun 2021 14:51:35 +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 453F34420D for ; Fri, 18 Jun 2021 14:51:35 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 14:51:19 +0200 Message-Id: <20210618125123.2903137-3-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.739 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 2/6] clone_vm: use destroy_config instead of manual unlink 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:36 -0000 and wrap the calls in an eval to preserve original errors causing us to remove the config in the first place.. also, remove disks before removing the locked config (reverse order of creation). Signed-off-by: Fabian Grünbichler --- src/PVE/API2/LXC.pm | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 9865a6b..807709a 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -1387,7 +1387,6 @@ __PACKAGE__->register_method({ PVE::Cluster::check_cfs_quorum(); - my $conffile; my $newconf = {}; my $mountpoints = {}; my $fullclone = {}; @@ -1395,7 +1394,6 @@ __PACKAGE__->register_method({ my $running; PVE::LXC::Config->create_and_lock_config($newid, 0); - $conffile = PVE::LXC::Config->config_file($newid); PVE::LXC::Config->lock_config($vmid, sub { my $src_conf = PVE::LXC::Config->set_lock($vmid, 'disk'); @@ -1492,13 +1490,18 @@ __PACKAGE__->register_method({ }; if (my $err = $@) { eval { PVE::LXC::Config->remove_lock($vmid, 'disk') }; - PVE::LXC::Config->lock_config($newid, sub { - my $conf = PVE::LXC::Config->load_config($newid); - die "Lost 'create' config lock, aborting.\n" - if !PVE::LXC::Config->has_lock($conf, 'create'); - unlink($conffile); - }); - warn $@ if $@; + warn "Failed to remove source CT config lock - $@\n" if $@; + + eval { + PVE::LXC::Config->lock_config($newid, sub { + my $conf = PVE::LXC::Config->load_config($newid); + die "Lost 'create' config lock, aborting.\n" + if !PVE::LXC::Config->has_lock($conf, 'create'); + PVE::LXC::Config->destroy_config($newid); + }); + }; + warn "Failed to remove target CT config - $@\n" if $@; + die $err; } }); @@ -1582,14 +1585,23 @@ __PACKAGE__->register_method({ if ($err) { # Now cleanup the config & disks: - unlink $conffile; - sleep 1; # some storages like rbd need to wait before release volume - really? foreach my $volid (@$newvollist) { eval { PVE::Storage::vdisk_free($storecfg, $volid); }; warn $@ if $@; } + + eval { + PVE::LXC::Config->lock_config($newid, sub { + my $conf = PVE::LXC::Config->load_config($newid); + die "Lost 'create' config lock, aborting.\n" + if !PVE::LXC::Config->has_lock($conf, 'create'); + PVE::LXC::Config->destroy_config($newid); + }); + }; + warn "Failed to remove target CT config - $@\n" if $@; + die "clone failed: $err"; } -- 2.30.2