From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/3] close #3476: allow user to prepare storage for activation in job-start hook
Date: Thu, 2 Dec 2021 12:00:03 +0100 [thread overview]
Message-ID: <20211202110005.38699-1-f.ebner@proxmox.com> (raw)
Signed-off-by: Fabian Ebner <f.ebner@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
next reply other threads:[~2021-12-02 11:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 11:00 Fabian Ebner [this message]
2021-12-02 11:00 ` [pve-devel] [RFC manager 2/3] vzdump: exec_backup: pick up latest version of storage.cfg after " Fabian Ebner
2021-12-02 11:00 ` [pve-devel] [RFC manager 3/3] vzdump: new: add reminder to get rid of duplicate activate_storage Fabian Ebner
2022-01-14 11:46 ` [pve-devel] [PATCH manager 1/3] close #3476: allow user to prepare storage for activation in job-start hook Fabian Grünbichler
2022-01-14 12:39 ` Fabian Ebner
2022-01-14 13:07 ` Fabian Grünbichler
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=20211202110005.38699-1-f.ebner@proxmox.com \
--to=f.ebner@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox