[pve-devel] [PATCH manager 1/3] close #3476: allow user to prepare storage for activation in job-start hook

[Fabian Ebner]

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 PVE/VZDump.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index b5a5fadd..667c92d3 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -501,11 +501,8 @@ sub new {
 
     if ($opts->{storage}) {
 	my $storage_cfg = PVE::Storage::config();
+	# Ignore errors here. exec_backup will die if activation fails there.
 	eval { PVE::Storage::activate_storage($storage_cfg, $opts->{storage}) };
-	if (my $err = $@) {
-	    chomp($err);
-	    $errors .= "could not activate storage '$opts->{storage}': $err";
-	}
 
 	my $info = eval { storage_info ($opts->{storage}) };
 	if (my $err = $@) {
@@ -1168,6 +1165,12 @@ sub exec_backup {
 
 	$self->run_hook_script ('job-start', undef, $job_start_fd);
 
+	my $storage_cfg = PVE::Storage::config();
+
+	# activating after job-start hook, so it has a chance to prepare, e.g. wake up remote node.
+	eval { PVE::Storage::activate_storage($storage_cfg, $opts->{storage}) };
+	die "could not activate storage '$opts->{storage}': $@" if $@;
+
 	foreach my $task (@$tasklist) {
 	    $self->exec_backup_task ($task);
 	    $errcount += 1 if $task->{state} ne 'ok';
-- 
2.30.2