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 0A4DBD435 for ; Fri, 15 Apr 2022 14:32:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F0AB73CED for ; Fri, 15 Apr 2022 14:31:42 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D7E563C97 for ; Fri, 15 Apr 2022 14:31:40 +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 A6ADF41EDD for ; Fri, 15 Apr 2022 14:31:34 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 15 Apr 2022 14:31:28 +0200 Message-Id: <20220415123130.49099-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415123130.49099-1-f.ebner@proxmox.com> References: <20220415123130.49099-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.099 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [RFC qemu-server 4/6] restore: also deactivate/destroy cloud-init disk upon 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: Fri, 15 Apr 2022 12:32:13 -0000 by re-using the same hash that's used when allocating/activating the disks in the helpers doing the opposite. Also in preparation to allow skipping certain disks upon restore. Signed-off-by: Fabian Ebner --- PVE/QemuServer.pm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 9a16b617..741a5e89 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6452,12 +6452,11 @@ sub restore_update_config_line { } my $restore_deactivate_volumes = sub { - my ($storecfg, $devinfo) = @_; + my ($storecfg, $virtdev_hash) = @_; my $vollist = []; - foreach my $devname (keys %$devinfo) { - my $volid = $devinfo->{$devname}->{volid}; - push @$vollist, $volid if $volid; + for my $dev (values $virtdev_hash->%*) { + push $vollist->@*, $dev->{volid} if $dev->{volid}; } eval { PVE::Storage::deactivate_volumes($storecfg, $vollist); }; @@ -6465,11 +6464,10 @@ my $restore_deactivate_volumes = sub { }; my $restore_destroy_volumes = sub { - my ($storecfg, $devinfo) = @_; + my ($storecfg, $virtdev_hash) = @_; - foreach my $devname (keys %$devinfo) { - my $volid = $devinfo->{$devname}->{volid}; - next if !$volid; + for my $dev (values $virtdev_hash->%*) { + my $volid = $dev->{volid} or next; eval { PVE::Storage::vdisk_free($storecfg, $volid); print STDERR "temporary volume '$volid' sucessfuly removed\n"; @@ -6655,7 +6653,8 @@ sub restore_proxmox_backup_archive { my $new_conf_raw = ''; my $rpcenv = PVE::RPCEnvironment::get(); - my $devinfo = {}; + my $devinfo = {}; # info about drives included in backup + my $virtdev_hash = {}; # info about allocated drives eval { # enable interrupts @@ -6710,7 +6709,7 @@ sub restore_proxmox_backup_archive { my $fh = IO::File->new($cfgfn, "r") || die "unable to read qemu-server.conf - $!\n"; - my $virtdev_hash = $parse_backup_hints->($rpcenv, $user, $storecfg, $fh, $devinfo, $options); + $virtdev_hash = $parse_backup_hints->($rpcenv, $user, $storecfg, $fh, $devinfo, $options); # fixme: rate limit? @@ -6771,13 +6770,13 @@ sub restore_proxmox_backup_archive { my $err = $@; if ($err || !$options->{live}) { - $restore_deactivate_volumes->($storecfg, $devinfo); + $restore_deactivate_volumes->($storecfg, $virtdev_hash); } rmtree $tmpdir; if ($err) { - $restore_destroy_volumes->($storecfg, $devinfo); + $restore_destroy_volumes->($storecfg, $virtdev_hash); die $err; } @@ -6947,7 +6946,8 @@ sub restore_vma_archive { my $oldtimeout; my $timeout = 5; - my $devinfo = {}; + my $devinfo = {}; # info about drives included in backup + my $virtdev_hash = {}; # info about allocated drives my $rpcenv = PVE::RPCEnvironment::get(); @@ -6974,7 +6974,7 @@ sub restore_vma_archive { PVE::Tools::file_copy($fwcfgfn, "${pve_firewall_dir}/$vmid.fw"); } - my $virtdev_hash = $parse_backup_hints->($rpcenv, $user, $cfg, $fh, $devinfo, $opts); + $virtdev_hash = $parse_backup_hints->($rpcenv, $user, $cfg, $fh, $devinfo, $opts); foreach my $info (values %{$virtdev_hash}) { my $storeid = $info->{storeid}; @@ -7080,14 +7080,14 @@ sub restore_vma_archive { alarm($oldtimeout) if $oldtimeout; - $restore_deactivate_volumes->($cfg, $devinfo); + $restore_deactivate_volumes->($cfg, $virtdev_hash); close($fifofh) if $fifofh; unlink $mapfifo; rmtree $tmpdir; if ($err) { - $restore_destroy_volumes->($cfg, $devinfo); + $restore_destroy_volumes->($cfg, $virtdev_hash); die $err; } -- 2.30.2