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 0209969217 for ; Thu, 12 Nov 2020 16:26:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F419C12642 for ; Thu, 12 Nov 2020 16:26:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 DA11512617 for ; Thu, 12 Nov 2020 16:26:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A09AE424F6 for ; Thu, 12 Nov 2020 16:26:04 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 12 Nov 2020 16:26:02 +0100 Message-Id: <20201112152603.8106-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201112152603.8106-1-d.csapak@proxmox.com> References: <20201112152603.8106-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.370 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [plugin.pm] Subject: [pve-devel] [PATCH storage 2/2] Storage/Plugin: read .comment files for comments 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, 12 Nov 2020 15:26:09 -0000 we have no way of setting them yet via api, but we can read them now Signed-off-by: Dominik Csapak --- PVE/Storage/Plugin.pm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index a046640..00ce9cb 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -19,6 +19,8 @@ use base qw(PVE::SectionConfig); use constant COMPRESSOR_RE => 'gz|lzo|zst'; +use constant COMMENT_EXT => ".comment"; + our @COMMON_TAR_FLAGS = qw( --one-file-system -p --sparse --numeric-owner --acls @@ -987,8 +989,18 @@ my $get_subdir_files = sub { my $res = []; + my $has_comment = {}; + foreach my $fn (<$path/*>) { + if (COMMENT_EXT eq substr($fn, -length(COMMENT_EXT))) { + my $real_fn = substr($fn, 0, length($fn) - length(COMMENT_EXT)); + if (!defined($has_comment->{$real_fn})) { + $has_comment->{$real_fn} = (-f $fn); + } + next; # we do not need to do anything with comments themselves + } + my $st = File::stat::stat($fn); next if (!$st || S_ISDIR($st->mode)); @@ -1008,6 +1020,7 @@ my $get_subdir_files = sub { } elsif ($tt eq 'backup') { next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/; next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!; + my $original = $fn; my $format = $2; $fn = $1; $info = { volid => "$sid:backup/$fn", format => $format }; @@ -1020,6 +1033,16 @@ my $get_subdir_files = sub { $info->{vmid} = $vmid // $1; } + my $comment_fn = $original.COMMENT_EXT; + if (!defined($has_comment->{$original})) { + $has_comment->{$original} = (-f $comment_fn); + } + + if ($has_comment->{$original}) { + my $comment = PVE::Tools::file_read_firstline($comment_fn); + $info->{comment} = $comment if defined($comment); + } + } elsif ($tt eq 'snippets') { $info = { -- 2.20.1