From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 2/6] vzdump: generate notes: initialize potentially undef values
Date: Mon, 9 May 2022 12:34:09 +0200 [thread overview]
Message-ID: <20220509103413.68248-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20220509103413.68248-1-f.ebner@proxmox.com>
For VMs, $task->{hostname} might be undef and when running on a
stand-alone node, there is no cluster name.
Reported-by: Marco Gabriel <mgabriel@inett.de>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* Use 'standalone node' rather than empty string if there is no
cluster.
PVE/VZDump.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 0dbf8928..86d5a232 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -97,8 +97,8 @@ my $generate_notes = sub {
$verify_notes_template->($notes_template);
my $info = {
- cluster => PVE::Cluster::get_clinfo()->{cluster}->{name},
- guestname => $task->{hostname},
+ cluster => PVE::Cluster::get_clinfo()->{cluster}->{name} // 'standalone node',
+ guestname => $task->{hostname} // "VM $task->{vmid}", # is always set for CTs
node => PVE::INotify::nodename(),
vmid => $task->{vmid},
};
--
2.30.2
next prev parent reply other threads:[~2022-05-09 10:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 10:34 [pve-devel] [PATCH-SERIES v2 manager] notes-template followups Fabian Ebner
2022-05-09 10:34 ` [pve-devel] [PATCH v4 manager 1/6] vzdump: verify parameters: properly verify notes-template Fabian Ebner
2022-05-09 10:34 ` Fabian Ebner [this message]
2022-05-09 10:34 ` [pve-devel] [PATCH v2 manager 3/6] ui: manual backup: list possible template variables directly Fabian Ebner
2022-05-09 10:34 ` [pve-devel] [PATCH v2 manager 4/6] vzdump: avoid 'requires' constraint when parsing defaults Fabian Ebner
2022-05-09 10:34 ` [pve-devel] [PATCH v2 manager 5/6] ui: manual backup: also set notes-template default Fabian Ebner
2022-05-09 10:34 ` [pve-devel] [PATCH v2 manager 6/6] configs: vzdump: add " Fabian Ebner
2022-05-12 15:20 ` [pve-devel] applied: [PATCH-SERIES v2 manager] notes-template followups 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=20220509103413.68248-3-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