From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH v2 manager 06/20] vzdump: notification: capture guest logs right after each backup
Date: Wed, 18 Nov 2026 14:18:30 +0100 [thread overview]
Message-ID: <20261118132947.1093069-7-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20261118132947.1093069-1-t.lamprecht@proxmox.com>
The log of a guest backup is written to a path derived from the guest
alone and was only read back when sending the notification at the end
of the job. This relies on no other backup of the guest starting in the
meantime, which no longer holds once backup jobs can run alongside each
other.
Read the log as the last step of each guest backup instead. Logs
longer than the notification size limit are cut, as they would not be
included anyway.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
---
changes v1 -> v2:
- warn if the guest log cannot be opened [Fiona]
Not changed: the guest log under /var/log/vzdump is kept after reading
instead of unlinked [Fiona], as it is the last backup log of the guest,
like before this series.
PVE/VZDump.pm | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 48d2541c9..92a48babf 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -368,24 +368,39 @@ sub read_vzdump_defaults {
return $res;
}
-my sub read_backup_task_logs {
+use constant MAX_LOG_SIZE => 1024 * 1024;
+
+my sub read_guest_log {
+ my ($path) = @_;
+
+ my $fh;
+ if (!open($fh, '<', $path)) {
+ debugmsg('warn', "unable to open log file '$path' - $!");
+ return undef;
+ }
+ my $log = '';
+ read($fh, $log, MAX_LOG_SIZE + 1); # anything longer is not sent anyway
+ close($fh);
+
+ return $log;
+}
+
+my sub format_backup_task_logs {
my ($task_list) = @_;
my $task_logs = "";
for my $task (@$task_list) {
my $vmid = $task->{vmid};
- my $log_file = $task->{tmplog};
if (!$task->{tmplog}) {
$task_logs .= "$vmid: no log available\n\n";
next;
}
- if (open(my $TMP, '<', "$log_file")) {
- while (my $line = <$TMP>) {
+ if (defined(my $log = $task->{log})) {
+ for my $line (split(/^/m, $log)) {
next if $line =~ /^status: \d+/; # not useful in mails
$task_logs .= encode8bit("$vmid: $line");
}
- close($TMP);
} else {
$task_logs .= "$vmid: Could not open log file\n\n";
}
@@ -484,8 +499,6 @@ my sub get_hostname {
return $hostname;
}
-use constant MAX_LOG_SIZE => 1024 * 1024;
-
sub send_notification {
my ($self, $tasklist, $total_time, $err, $detail_pre, $detail_post) = @_;
@@ -516,7 +529,7 @@ sub send_notification {
my $text_log_part = "$cmdline\n\n";
$text_log_part .= $detail_pre . "\n" if defined($detail_pre);
- $text_log_part .= read_backup_task_logs($tasklist);
+ $text_log_part .= format_backup_task_logs($tasklist);
$text_log_part .= $detail_post if defined($detail_post);
if (length($text_log_part) > MAX_LOG_SIZE) {
@@ -1396,6 +1409,8 @@ sub exec_backup_task {
eval { $self->run_hook_script('log-end', $task); };
debugmsg('warn', $@) if $@; # message already contains command with phase name
+ $task->{log} = read_guest_log($task->{tmplog}) if $task->{tmplog};
+
die $err if $err && $err =~ m/^interrupted by signal$/;
}
--
2.47.3
next prev parent reply other threads:[~2026-11-18 13:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 13:18 [PATCH v2 cluster,storage,guest-common,manager,docs 00/20] parallel guest backups and backup concurrency limits Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 cluster 01/20] datacenter config: add backup concurrency setting Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 cluster 02/20] datacenter config: backup concurrency: add cluster-wide limit Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 storage 03/20] add backup concurrency option to storages Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 guest-common 04/20] vzdump: add options for parallel guest backups and overlapping jobs Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 05/20] vzdump: drop never-set fallback for the lock wait time Thomas Lamprecht
2026-11-18 13:18 ` Thomas Lamprecht [this message]
2026-11-18 13:18 ` [PATCH v2 manager 07/20] vzdump: stop all running backup jobs of the node Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 08/20] vzdump: show the error if a job could not get the global lock Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 09/20] vzdump: run job-init hook and set up target once the job may start Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 10/20] vzdump: list guests as skipped if the job could not start Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 11/20] vzdump: back up guests of a job in parallel Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 12/20] vzdump: allow jobs to run alongside each other Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 13/20] ui: options: add backup concurrency for datacenter and nodes Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 14/20] ui: backup job: add concurrency and overlap options Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 15/20] ui: backup now: add overlap option Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 16/20] vzdump: limit concurrent guest backups cluster-wide Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 17/20] vzdump: honor backup concurrency limits of storages Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 18/20] api: backup info: add endpoints for cluster-wide backup slots Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 manager 19/20] ui: add cluster-wide and storage backup concurrency limits Thomas Lamprecht
2026-11-18 13:18 ` [PATCH v2 docs 20/20] vzdump: document concurrent backups and their limits Thomas Lamprecht
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=20261118132947.1093069-7-t.lamprecht@proxmox.com \
--to=t.lamprecht@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.