public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v4 manager 1/7] partially close #438: vzdump: support setting notes-template
Date: Wed, 27 Apr 2022 17:41:10 +0200	[thread overview]
Message-ID: <20220427154116.115071-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20220427154116.115071-1-f.ebner@proxmox.com>

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Changes from v3:
    * also escape \\ and \n

 PVE/VZDump.pm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index de29ca60..5f78746d 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -70,6 +70,29 @@ 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 $unescape = {
+	'\\\\' => '\\', # replace \\ by \
+	'\n' => "\n", # turn literal \n into real newline
+    };
+
+    $notes_template =~ s/(\Q\\\E|\Q\n\E)/$unescape->{$1}/g;
+
+    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) = @_;
 
@@ -1017,6 +1040,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





  reply	other threads:[~2022-04-27 15:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-27 15:41 [pve-devel] [PATCH-SERIES v4 manager] add protected and notes-template parameters for vzdump Fabian Ebner
2022-04-27 15:41 ` Fabian Ebner [this message]
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 2/7] ui: util: add helpers for (un)escaping notes-template Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 3/7] ui: backup: allow setting protected and notes-template for manual backup Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 4/7] close #438: ui: backup job: allow setting a notes-template for a job Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 5/7] ui: dc/backup: move note template to own tab and adapt Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 6/7] ui: dc/backup: (un)escape notes-template Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 7/7] vzdump: generate notes: die upon unexpected escape character or variable Fabian Ebner
2022-04-28 16:30 ` [pve-devel] applied-series: [PATCH-SERIES v4 manager] add protected and notes-template parameters for vzdump Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220427154116.115071-2-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal