From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 5A6DF1FF141 for ; Tue, 19 May 2026 13:08:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 849D83088; Tue, 19 May 2026 13:07:31 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH storage v3 09/11] plugin: volume snapshot info: correctly return internal snapshot information Date: Tue, 19 May 2026 13:06:34 +0200 Message-ID: <20260519110646.25060-10-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260519110646.25060-1-f.ebner@proxmox.com> References: <20260519110646.25060-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1779188796087 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Message-ID-Hash: TLHXD72UZZE7VZMJGMQUICFWAKX5TQS2 X-Message-ID-Hash: TLHXD72UZZE7VZMJGMQUICFWAKX5TQS2 X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: If the $follow_backing_files parameter is set for qemu_img_info(), it will always return an array reference. For the implementation in Plugin.pm it will thus be detected as a volume chain even if the 'snapshot-as-volume-chain' storage configuration option is not used. Fix this, by relying on the storage configuration option. Flip the branches to avoid the need to negate the condition. For the implementation in LVMPlugin.pm, do not call qemu-img if the 'snapshot-as-volume-chain' storage configuration option is not used. Signed-off-by: Fiona Ebner --- src/PVE/Storage/LVMPlugin.pm | 4 ++-- src/PVE/Storage/Plugin.pm | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index ebf9a47..93853b7 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -883,6 +883,8 @@ sub status { sub volume_snapshot_info { my ($class, $scfg, $storeid, $volname) = @_; + return {} if !$scfg->{'snapshot-as-volume-chain'}; + my $short_volname = ($class->parse_volname($volname))[1]; my $get_snapname_from_path = sub { @@ -907,9 +909,7 @@ sub volume_snapshot_info { } my $info = {}; my $order = 0; - return $info if ref($json_decode) ne 'ARRAY'; - #no snapshot or external snapshots is an arrayref my $snapshots = $json_decode; for my $snap (@$snapshots) { my $snapfile = $snap->{filename}; diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index c92ba63..0f0ddf4 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1903,7 +1903,8 @@ sub volume_snapshot_info { my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = $class->parse_volname($volname); - my $json = PVE::Storage::Common::qemu_img_info($path, undef, 10, 1); + my $json = + PVE::Storage::Common::qemu_img_info($path, undef, 10, $scfg->{'snapshot-as-volume-chain'}); die "failed to query file information with qemu-img\n" if !$json; my $json_decode = eval { decode_json($json) }; if ($@) { @@ -1911,16 +1912,8 @@ sub volume_snapshot_info { } my $info = {}; my $order = 0; - if (ref($json_decode) eq 'HASH') { - #internal snapshots is a hashref - my $snapshots = $json_decode->{snapshots}; - for my $snap (@$snapshots) { - my $snapname = $snap->{name}; - $info->{$snapname}->{timestamp} = $snap->{'date-sec'}; - - } - } elsif (ref($json_decode) eq 'ARRAY') { - #no snapshot or external snapshots is an arrayref + if ($scfg->{'snapshot-as-volume-chain'}) { + # calling qemu_img_info() with $follow_backing_files gives an array reference my $snapshots = $json_decode; for my $snap (@$snapshots) { my $snapfile = $snap->{filename}; @@ -1947,6 +1940,14 @@ sub volume_snapshot_info { } $order++; } + } else { + # calling qemu_img_info() without $follow_backing_files gives a single hash reference + my $snapshots = $json_decode->{snapshots}; + for my $snap (@$snapshots) { + my $snapname = $snap->{name}; + $info->{$snapname}->{timestamp} = $snap->{'date-sec'}; + + } } return $info; -- 2.47.3