[pve-devel] [PATCH v2 manager 2/2] close #3476: vzdump: add job-init hook

[Fabian Grünbichler]

On January 17, 2022 12:35 pm, Fabian Ebner wrote:
> which allows users to prepare the backup storage for activation (e.g.
> by waking up a remote node).
> 
> Suggested-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>

Reviewed-by: Fabian Grünbichler <f.gruenbichler at proxmox.com> 

but giving others a chance to object to the new phase before applying ;)

> ---
> 
> Changes from v1:
>     * Different approach: add a new hook rather than trying to re-use
>       job-start.
>     * Add example to the example hook script to clarify when job-init
>       should/can be used.
> 
>  PVE/VZDump.pm         | 17 ++++++++++++++++-
>  vzdump-hook-script.pl | 12 +++++++++++-
>  2 files changed, 27 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
> index b5a5fadd..e526eef8 100644
> --- a/PVE/VZDump.pm
> +++ b/PVE/VZDump.pm
> @@ -497,6 +497,13 @@ sub new {
>  	$opts->{storage} = 'local';
>      }
>  
> +    $self->{job_init_log} = '';
> +    open my $job_init_fd, '>', \$self->{job_init_log};
> +    $self->run_hook_script('job-init', undef, $job_init_fd);
> +    close $job_init_fd;
> +
> +    PVE::Cluster::cfs_update(); # Pick up eventual changes made by the hook script.

small nit for when this gets applied: s/eventual/possible

eventual means 'final' or something else happening 'later'[0] (not 
'eventuell' ;))

0: https://www.merriam-webster.com/thesaurus/eventual

> +
>      my $errors = '';
>  
>      if ($opts->{storage}) {
> @@ -1194,7 +1201,15 @@ sub exec_backup {
>  
>      my $totaltime = time() - $starttime;
>  
> -    eval { $self->sendmail ($tasklist, $totaltime, undef, $job_start_log, $job_end_log); };
> +    eval {
> +	$self->sendmail(
> +	    $tasklist,
> +	    $totaltime,
> +	    undef,
> +	    $self->{job_init_log} . $job_start_log,
> +	    $job_end_log,
> +	);
> +    };
>      debugmsg ('err', $@) if $@;
>  
>      die $err if $err;
> diff --git a/vzdump-hook-script.pl b/vzdump-hook-script.pl
> index 60edbc04..81b9b10f 100755
> --- a/vzdump-hook-script.pl
> +++ b/vzdump-hook-script.pl
> @@ -11,11 +11,13 @@ print "HOOK: " . join (' ', @ARGV) . "\n";
>  
>  my $phase = shift;
>  
> -if ($phase eq 'job-start' ||
> +if ($phase eq 'job-init' ||
> +    $phase eq 'job-start' ||
>      $phase eq 'job-end'  ||
>      $phase eq 'job-abort') {
>  
>      # undef for Proxmox Backup Server storages
> +    # undef in phase 'job-init' except when --dumpdir is used directly
>      my $dumpdir = $ENV{DUMPDIR};
>  
>      # undef when --dumpdir is used directly
> @@ -26,6 +28,14 @@ if ($phase eq 'job-start' ||
>      print "storeid=$storeid;" if defined($storeid);
>      print "\n";
>  
> +    # example: wake up remote storage node and enable storage
> +    if ($phase eq 'job-init') {
> +        #system ("") == 0 ||
> +        #    die "waking up remote node failed";
> +        #system ("/sbin/pvesm set $storeid --disable 0") == 0 ||
> +        #    die "enabling storage $storeid failed";
> +    }
> +
>      # do what you want
>  
>  } elsif ($phase eq 'backup-start' ||
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>