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 AD5A4D3ED for ; Fri, 15 Apr 2022 14:31:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9AE563CEC 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 F0CF43CA1 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 4979441F31 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:25 +0200 Message-Id: <20220415123130.49099-2-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 1/6] restore: cleanup oldconf: also clean up snapshots from kept volumes 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:31:42 -0000 --- PVE/QemuServer.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0be6be90..f221d93c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6228,6 +6228,8 @@ sub restore_file_archive { my $restore_cleanup_oldconf = sub { my ($storecfg, $vmid, $oldconf, $virtdev_hash) = @_; + my $kept_disks = {}; + PVE::QemuConfig->foreach_volume($oldconf, sub { my ($ds, $drive) = @_; @@ -6246,11 +6248,13 @@ my $restore_cleanup_oldconf = sub { if (my $err = $@) { warn $err; } + } else { + $kept_disks->{$volid} = 1; } }); - # delete vmstate files, after the restore we have no snapshots anymore - foreach my $snapname (keys %{$oldconf->{snapshots}}) { + # after the restore we have no snapshots anymore + for my $snapname (keys $oldconf->{snapshots}->%*) { my $snap = $oldconf->{snapshots}->{$snapname}; if ($snap->{vmstate}) { eval { PVE::Storage::vdisk_free($storecfg, $snap->{vmstate}); }; @@ -6258,6 +6262,11 @@ my $restore_cleanup_oldconf = sub { warn $err; } } + + for my $volid (keys $kept_disks->%*) { + eval { PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snapname); }; + warn $@ if $@; + } } }; -- 2.30.2