From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F28BE70A8E for ; Mon, 9 May 2022 12:34:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E00F42B6B1 for ; Mon, 9 May 2022 12:34:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 121322B675 for ; Mon, 9 May 2022 12:34:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D9D2D43255 for ; Mon, 9 May 2022 12:34:16 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 9 May 2022 12:34:09 +0200 Message-Id: <20220509103413.68248-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220509103413.68248-1-f.ebner@proxmox.com> References: <20220509103413.68248-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 manager 2/6] vzdump: generate notes: initialize potentially undef values X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 May 2022 10:34:49 -0000 For VMs, $task->{hostname} might be undef and when running on a stand-alone node, there is no cluster name. Reported-by: Marco Gabriel Signed-off-by: Fabian Ebner --- 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