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 5F4AF75588 for ; Wed, 13 Oct 2021 14:32:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5D8D111548 for ; Wed, 13 Oct 2021 14:32:00 +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 D3BA81153D for ; Wed, 13 Oct 2021 14:31:59 +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 ACEC145DCC for ; Wed, 13 Oct 2021 14:31:59 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Wed, 13 Oct 2021 14:31:54 +0200 Message-Id: <20211013123154.1221852-3-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211013123154.1221852-1-o.bektas@proxmox.com> References: <20211013123154.1221852-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.971 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. [abstractconfig.pm] Subject: [pve-devel] [PATCH v2 guest-common 2/2] snapshots: abort if new snapshot name is already 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: Wed, 13 Oct 2021 12:32:00 -0000 Signed-off-by: Oguz Bektas --- src/PVE/AbstractConfig.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/PVE/AbstractConfig.pm b/src/PVE/AbstractConfig.pm index 3348d8a..6849664 100644 --- a/src/PVE/AbstractConfig.pm +++ b/src/PVE/AbstractConfig.pm @@ -721,14 +721,22 @@ 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} // ''; + die "snapshot '$snapname' cannot be used, $snapname already a parent for $existing_snapshot\n" + 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