From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values
Date: Mon, 09 May 2022 09:58:25 +0200 [thread overview]
Message-ID: <1652082742.69si0wheac.astroid@nora.none> (raw)
In-Reply-To: <20220506105938.66419-1-f.ebner@proxmox.com>
On May 6, 2022 12:59 pm, Fabian Ebner wrote:
> 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>
> ---
> PVE/VZDump.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
> index edcab696..8f11c820 100644
> --- a/PVE/VZDump.pm
> +++ b/PVE/VZDump.pm
> @@ -74,8 +74,8 @@ my $generate_notes = sub {
> my ($notes_template, $task) = @_;
>
> my $info = {
> - cluster => PVE::Cluster::get_clinfo()->{cluster}->{name},
> - guestname => $task->{hostname},
> + cluster => PVE::Cluster::get_clinfo()->{cluster}->{name} // '',
might make sense to either use '-' or 'Standalone node' as fallback
here? both variants would be easily parsable as 'not a cluster name' ;)
depending on the exact template an empty variable resolution can read
quite weird/confusing.
e.g.
Cluster {cluster}
{guestname}
and a quick glance would imply we are on a cluster called like the guest
;)
> + guestname => $task->{hostname} // "VM $task->{vmid}", # is always set for CTs
> node => PVE::INotify::nodename(),
> vmid => $task->{vmid},
> };
> --
> 2.30.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
prev parent reply other threads:[~2022-05-09 7:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 10:59 Fabian Ebner
2022-05-09 7:58 ` Fabian Grünbichler [this message]
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=1652082742.69si0wheac.astroid@nora.none \
--to=f.gruenbichler@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