[PATCH manager 09/19] vzdump: run job-init hook and set up target once the job may start

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

The job-init hook and the activation of the backup storage ran before
taking the global lock. A job waiting for another one thus already
called its hook script, for example to mount or wake up its target,
while the other job was still running, and then possibly waited for
hours.

Take the lock first and do the job setup afterwards, handling setup
errors like a failure to get the lock. Hook scripts now see the job
phases of different jobs strictly in sequence.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/API2/VZDump.pm      |  4 +++-
 PVE/VZDump.pm           | 20 ++++++++++++--------
 test/vzdump_new_test.pl |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm
index c8b66169e..083b9ea35 100644
--- a/PVE/API2/VZDump.pm
+++ b/PVE/API2/VZDump.pm
@@ -137,7 +137,9 @@ __PACKAGE__->register_method({
             my $vzdump = PVE::VZDump->new($cmdline, $param, $skiplist);
 
             my $LOCK_FH = eval {
-                $vzdump->getlock($upid); # only one process allowed
+                my $lock_fh = $vzdump->getlock($upid); # only one process allowed
+                $vzdump->init_job();
+                $lock_fh;
             };
             if (my $err = $@) {
                 chomp($err); # otherwise reported as multiple problems
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index a9a2256a8..a86be4f09 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -674,6 +674,16 @@ sub new {
         delete $opts->{$_} for qw(notes-template protected);
     }
 
+    $self->{'default-prune-backups'} = $defaults->{'prune-backups'};
+
+    return $self;
+}
+
+sub init_job {
+    my ($self) = @_;
+
+    my $opts = $self->{opts};
+
     my $errors = '';
     my $add_error = sub {
         my ($error) = @_;
@@ -714,7 +724,7 @@ sub new {
         die "internal error";
     }
 
-    $opts->{'prune-backups'} //= $defaults->{'prune-backups'};
+    $opts->{'prune-backups'} //= $self->{'default-prune-backups'};
 
     # avoid triggering any remove code path if keep-all is set
     $opts->{remove} = 0 if $opts->{'prune-backups'}->{'keep-all'};
@@ -723,13 +733,7 @@ sub new {
         $add_error->("tmpdir '$opts->{tmpdir}' does not exist");
     }
 
-    if ($errors) {
-        eval { $self->send_notification([], 0, $errors); };
-        debugmsg('err', $@) if $@;
-        die "$errors\n";
-    }
-
-    return $self;
+    die "$errors\n" if $errors;
 }
 
 sub get_mount_info {
diff --git a/test/vzdump_new_test.pl b/test/vzdump_new_test.pl
index db829e70f..490ae4482 100755
--- a/test/vzdump_new_test.pl
+++ b/test/vzdump_new_test.pl
@@ -539,6 +539,7 @@ foreach my $test (@tests) {
         PVE::VZDump::parse_mailto_exclude_path($test->{cli_param});
 
         my $vzdump = PVE::VZDump->new('fake cmdline', $test->{cli_param}, undef);
+        $vzdump->init_job();
 
         my $opts = $vzdump->{opts} or die "did not get options\n";
 
-- 
2.47.3