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 CA7307591B for ; Thu, 14 Oct 2021 09:34:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BE21719ED6 for ; Thu, 14 Oct 2021 09:34:50 +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 4135E19EC8 for ; Thu, 14 Oct 2021 09:34:50 +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 0F35345DF3 for ; Thu, 14 Oct 2021 09:34:50 +0200 (CEST) To: pve-devel@lists.proxmox.com, Oguz Bektas References: <20211013123154.1221852-1-o.bektas@proxmox.com> <20211013123154.1221852-3-o.bektas@proxmox.com> From: Fabian Ebner Message-ID: <982749a2-e94c-2bc0-b076-869756c08648@proxmox.com> Date: Thu, 14 Oct 2021 09:34:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211013123154.1221852-3-o.bektas@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.273 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [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: Thu, 14 Oct 2021 07:34:50 -0000 Am 13.10.21 um 14:31 schrieb Oguz Bektas: > 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; > + } Personally, I'd prefer the "automatically fix it up"-approach, because we we're the ones introducing the invalid property in the first place. But if we go for the "error out"-approach, the error message should be different. You're telling the user that the snapshot name cannot be used, but they'll just wonder why. Instead, the error should rather tell the user that manual fix-up is required and that the parent property is invalid, because the parent doesn't exist. > + > + $snap = $snapshots->{$snapname} = {}; > > if ($save_vmstate && $class->__snapshot_check_running($vmid)) { > $class->__snapshot_save_vmstate($vmid, $conf, $snapname, $storecfg); >