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 9AAA5754AE for ; Wed, 21 Apr 2021 16:26:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9140410A3F for ; Wed, 21 Apr 2021 16:25: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 D10AA10A2E for ; Wed, 21 Apr 2021 16:25:34 +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 A730746200 for ; Wed, 21 Apr 2021 16:25:34 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Wed, 21 Apr 2021 16:25:24 +0200 Message-Id: <20210421142525.2159-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210421142525.2159-1-s.reiter@proxmox.com> References: <20210421142525.2159-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 Adjusted score from AWL reputation of From: address 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. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/3] live-restore: don't remove VM on error 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, 21 Apr 2021 14:26:05 -0000 Potentially an admin can still recover some data, or wants to inspect the state. Signed-off-by: Stefan Reiter --- The message printed in the task log already suggest as much. PVE/QemuServer.pm | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index fec2edb..d042a7e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6386,28 +6386,17 @@ sub restore_proxmox_backup_archive { PVE::AccessControl::add_vm_to_pool($vmid, $options->{pool}) if $options->{pool}; if ($options->{live}) { - eval { - # enable interrupts - local $SIG{INT} = - local $SIG{TERM} = - local $SIG{QUIT} = - local $SIG{HUP} = - local $SIG{PIPE} = sub { die "got signal ($!) - abort\n"; }; + # enable interrupts + local $SIG{INT} = + local $SIG{TERM} = + local $SIG{QUIT} = + local $SIG{HUP} = + local $SIG{PIPE} = sub { die "got signal ($!) - abort\n"; }; - my $conf = PVE::QemuConfig->load_config($vmid); - die "cannot do live-restore for template\n" if PVE::QemuConfig->is_template($conf); + my $conf = PVE::QemuConfig->load_config($vmid); + die "cannot do live-restore for template\n" if PVE::QemuConfig->is_template($conf); - pbs_live_restore($vmid, $conf, $storecfg, $devinfo, $repo, $keyfile, $pbs_backup_name); - }; - - $err = $@; - if ($err) { - warn "destroying partially live-restored VM, all temporary data will be lost!\n"; - $restore_deactivate_volumes->($storecfg, $devinfo); - $restore_destroy_volumes->($storecfg, $devinfo); - PVE::QemuConfig->destroy_config($vmid); - die $err; - } + pbs_live_restore($vmid, $conf, $storecfg, $devinfo, $repo, $keyfile, $pbs_backup_name); } } -- 2.20.1