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 53B6775957 for ; Thu, 14 Oct 2021 11:30:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 51D621C1EE for ; Thu, 14 Oct 2021 11:30:06 +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 AE95C1C1DC for ; Thu, 14 Oct 2021 11:30:05 +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 8988F461D7 for ; Thu, 14 Oct 2021 11:30:05 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Thu, 14 Oct 2021 11:29:57 +0200 Message-Id: <20211014092957.845329-3-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211014092957.845329-1-o.bektas@proxmox.com> References: <20211014092957.845329-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.882 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v3 guest-common 2/2] snapshots: delete parent property if new snapshot name is already a parent to existing one 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: Thu, 14 Oct 2021 09:30:06 -0000 Signed-off-by: Oguz Bektas --- v2->v3: * automatically delete the 'parent' property for an existing snapshot (instead of aborting) if its the same as the new snapshot name (and the snapshot referenced by 'parent' is not used) src/PVE/AbstractConfig.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/PVE/AbstractConfig.pm b/src/PVE/AbstractConfig.pm index 3348d8a..e4ddeab 100644 --- a/src/PVE/AbstractConfig.pm +++ b/src/PVE/AbstractConfig.pm @@ -721,14 +721,21 @@ sub __snapshot_prepare { $conf->{lock} = 'snapshot'; + my $snapshots = $conf->{snapshots}; + die "snapshot name '$snapname' already used\n" - if defined($conf->{snapshots}->{$snapname}); + if defined($snapshots->{$snapname}); my $storecfg = PVE::Storage::config(); die "snapshot feature is not available\n" if !$class->has_feature('snapshot', $conf, $storecfg, undef, undef, $snapname eq 'vzdump'); - $snap = $conf->{snapshots}->{$snapname} = {}; + foreach my $existing_snapshot (keys %$snapshots) { + my $parent_name = $snapshots->{$existing_snapshot}->{parent} // ''; + delete $snapshots->{$existing_snapshot}->{parent} if $snapname eq $parent_name; + } + + $snap = $snapshots->{$snapname} = {}; if ($save_vmstate && $class->__snapshot_check_running($vmid)) { $class->__snapshot_save_vmstate($vmid, $conf, $snapname, $storecfg); -- 2.30.2