From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <l.wagner@proxmox.com> 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 CF7E494E4 for <pve-devel@lists.proxmox.com>; Fri, 25 Aug 2023 11:45:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A8A0357B3 for <pve-devel@lists.proxmox.com>; Fri, 25 Aug 2023 11:45:28 +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 for <pve-devel@lists.proxmox.com>; Fri, 25 Aug 2023 11:45:26 +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 47B2E446A5 for <pve-devel@lists.proxmox.com>; Fri, 25 Aug 2023 11:45:26 +0200 (CEST) From: Lukas Wagner <l.wagner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 25 Aug 2023 11:45:12 +0200 Message-Id: <20230825094512.271010-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.037 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vzdump.pm, proxmox.com] Subject: [pve-devel] [PATCH manager] vzdump: fix notifications for backing up VMs with 2+ disks to PBS X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Fri, 25 Aug 2023 09:45:58 -0000 In some situations, such as backing up VMs with 2 or more disks to PBS, we get passed the backup archive size as a string instead of as an integer. This led to errors rendering the notification template down the line. This commit explicitly casts the data from the task table to an int. It would be a good idea to actually hunt down the places that produced the string instead of an integer, but as a quick fix and as a safeguard against similar lurking errors this approach is fine, IMO. Signed-off-by: Lukas Wagner <l.wagner@proxmox.com> --- Popped up in: https://forum.proxmox.com/threads/keine-mails-mehr-nach-backup.132675/ PVE/VZDump.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 2671e3b1..454ab494 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -387,11 +387,11 @@ sub build_guest_table { my $size = $successful ? $task->{size} : 0; my $filename = $successful ? $task->{target} : undef; push @{$table->{data}}, { - "vmid" => $task->{vmid}, + "vmid" => int($task->{vmid}), "name" => $task->{hostname}, "status" => $task->{state}, - "time" => $task->{backuptime}, - "size" => $size, + "time" => int($task->{backuptime}), + "size" => int($size), "filename" => $filename, }; } -- 2.39.2