* [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values
@ 2022-05-06 10:59 Fabian Ebner
2022-05-09 7:58 ` Fabian Grünbichler
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Ebner @ 2022-05-06 10:59 UTC (permalink / raw)
To: pve-devel
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} // '',
+ guestname => $task->{hostname} // "VM $task->{vmid}", # is always set for CTs
node => PVE::INotify::nodename(),
vmid => $task->{vmid},
};
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values
2022-05-06 10:59 [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values Fabian Ebner
@ 2022-05-09 7:58 ` Fabian Grünbichler
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Grünbichler @ 2022-05-09 7:58 UTC (permalink / raw)
To: Proxmox VE development discussion
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
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-09 7:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-06 10:59 [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values Fabian Ebner
2022-05-09 7:58 ` Fabian Grünbichler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox