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 D46E5B7BA for ; Thu, 7 Apr 2022 12:05:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CAAC334F4 for ; Thu, 7 Apr 2022 12:05:48 +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 4D33F34C8 for ; Thu, 7 Apr 2022 12:05:47 +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 1A12E46158 for ; Thu, 7 Apr 2022 12:05:47 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 7 Apr 2022 12:05:41 +0200 Message-Id: <20220407100543.130953-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220407100543.130953-1-f.ebner@proxmox.com> References: <20220407100543.130953-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.107 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vzdump.pm] Subject: [pve-devel] [PATCH v3 manager 2/4] partially close #438: vzdump: support setting notes-template 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, 07 Apr 2022 10:05:48 -0000 Signed-off-by: Fabian Ebner --- Changes from v2: * Switch to {{var}} syntax. Arguably, a warning from failing to set notes is not very visible, but I didn't want to make it a full-blown error. PVE/VZDump.pm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index f0a28a76..ceecdbe3 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -70,6 +70,22 @@ sub run_command { PVE::Tools::run_command($cmdstr, %param, logfunc => $logfunc); } +my $generate_notes = sub { + my ($notes_template, $task) = @_; + + my $info = { + cluster => PVE::Cluster::get_clinfo()->{cluster}->{name}, + guestname => $task->{hostname}, + node => PVE::INotify::nodename(), + vmid => $task->{vmid}, + }; + + my $vars = join('|', keys $info->%*); + $notes_template =~ s/\{\{($vars)\}\}/\Q$info->{$1}\E/g; + + return $notes_template; +}; + my $parse_prune_backups_maxfiles = sub { my ($param, $kind) = @_; @@ -1013,6 +1029,13 @@ sub exec_backup_task { my $volname = $opts->{pbs} ? $task->{target} : basename($task->{target}); my $volid = "${storeid}:backup/${volname}"; + if ($opts->{'notes-template'} && $opts->{'notes-template'} ne '') { + debugmsg('info', "adding notes to backup", $logfd); + my $notes = $generate_notes->($opts->{'notes-template'}, $task); + eval { PVE::Storage::update_volume_attribute($cfg, $volid, 'notes', $notes) }; + debugmsg('warn', "unable to add notes - $@", $logfd) if $@; + } + if ($opts->{protected}) { debugmsg('info', "marking backup as protected", $logfd); eval { PVE::Storage::update_volume_attribute($cfg, $volid, 'protected', 1) }; -- 2.30.2