[pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values

[pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values

[Fabian Ebner]

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

Re: [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values

[Fabian Grünbichler]

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
> 
> 
>