From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 51DBE8313D for ; Thu, 2 Dec 2021 12:00:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 415331887F for ; Thu, 2 Dec 2021 12:00:11 +0100 (CET) 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 id 8F67A1885D for ; Thu, 2 Dec 2021 12:00:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 53C5F44DB7 for ; Thu, 2 Dec 2021 12:00:09 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 2 Dec 2021 12:00:03 +0100 Message-Id: <20211202110005.38699-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.162 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pve-devel] [PATCH manager 1/3] close #3476: allow user to prepare storage for activation in job-start hook X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2021 11:00:11 -0000 Signed-off-by: Fabian Ebner --- 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