[PATCH manager 10/19] vzdump: list guests as skipped if the job could not start

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

If a job could not get the global lock, or its setup failed, for
example because the job-init hook failed or the backup server was not
reachable, none of its guests got backed up, but the notification did
not list any of them.

List them as skipped with the reason, so notifications, including those
sent only on failure, show what is missing.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/API2/VZDump.pm |  3 ++-
 PVE/VZDump.pm      | 48 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm
index 083b9ea35..73291189f 100644
--- a/PVE/API2/VZDump.pm
+++ b/PVE/API2/VZDump.pm
@@ -143,7 +143,8 @@ __PACKAGE__->register_method({
             };
             if (my $err = $@) {
                 chomp($err); # otherwise reported as multiple problems
-                $vzdump->send_notification([], 0, $err);
+                my $tasklist = $vzdump->skip_all_guests($rpcenv, $user, 'job did not start');
+                $vzdump->send_notification($tasklist, 0, $err);
                 die "$err\n";
             }
 
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index a86be4f09..b12281790 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -387,7 +387,10 @@ my sub format_backup_task_logs {
 
     for my $task (@$task_list) {
         my $vmid = $task->{vmid};
-        if (!$task->{tmplog}) {
+        if ($task->{state} eq 'skipped') {
+            $task_logs .= "$vmid: skipped - $task->{msg}\n\n";
+            next;
+        } elsif (!$task->{tmplog}) {
             $task_logs .= "$vmid: no log available\n\n";
             next;
         }
@@ -1400,18 +1403,11 @@ sub exec_backup_task {
     die $err if $err && $err =~ m/^interrupted by signal$/;
 }
 
-sub exec_backup {
+sub get_tasklist {
     my ($self, $rpcenv, $authuser) = @_;
 
     my $opts = $self->{opts};
 
-    debugmsg('info', "starting new backup job: $self->{cmdline}", undef, 1);
-
-    if (scalar(@{ $self->{skiplist} })) {
-        my $skip_string = join(', ', sort { $a <=> $b } @{ $self->{skiplist} });
-        debugmsg('info', "skip external VMs: $skip_string");
-    }
-
     my $tasklist = [];
     my $vzdump_plugins = {};
     foreach my $plugin (@{ $self->{plugins} }) {
@@ -1438,6 +1434,40 @@ sub exec_backup {
             };
     }
 
+    return $tasklist;
+}
+
+my sub skip_task {
+    my ($task, $reason) = @_;
+
+    $task->{state} = 'skipped';
+    $task->{msg} = $reason;
+    debugmsg('err', "Backup of VM $task->{vmid} skipped - $reason");
+}
+
+sub skip_all_guests {
+    my ($self, $rpcenv, $authuser, $reason) = @_;
+
+    my $tasklist = $self->get_tasklist($rpcenv, $authuser);
+    skip_task($_, $reason) for $tasklist->@*;
+
+    return $tasklist;
+}
+
+sub exec_backup {
+    my ($self, $rpcenv, $authuser) = @_;
+
+    my $opts = $self->{opts};
+
+    debugmsg('info', "starting new backup job: $self->{cmdline}", undef, 1);
+
+    if (scalar(@{ $self->{skiplist} })) {
+        my $skip_string = join(', ', sort { $a <=> $b } @{ $self->{skiplist} });
+        debugmsg('info', "skip external VMs: $skip_string");
+    }
+
+    my $tasklist = $self->get_tasklist($rpcenv, $authuser);
+
     # Use in-memory files for the outer hook logs to pass them to sendmail.
     my $job_start_log = '';
     my $job_end_log = '';
-- 
2.47.3