proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-05-02 22:26:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #949: add post-restart hook to vzdump

Browse Source
This commit is contained in:
Fabian Grünbichler 2016-04-22 10:35:29 +02:00 committed by Dietmar Maurer
parent 4f28394a37
commit d50472438d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/VZDump.pm
View File

@ -903,6 +903,7 @@ sub exec_backup_task {
$cleanup->{resume} = 0; $cleanup->{resume} = 0;
$self->run_hook_script('pre-restart', $task, $logfd); $self->run_hook_script('pre-restart', $task, $logfd);
$plugin->resume_vm($task, $vmid); $plugin->resume_vm($task, $vmid);
$self->run_hook_script('post-restart', $task, $logfd);
my $delay = time () - $vmstoptime; my $delay = time () - $vmstoptime;
debugmsg('info', "vm is online again after $delay seconds", $logfd); debugmsg('info', "vm is online again after $delay seconds", $logfd);
} }
@ -934,6 +935,8 @@ sub exec_backup_task {
debugmsg ('info', "vm is online again after $delay seconds", $logfd); debugmsg ('info', "vm is online again after $delay seconds", $logfd);
} }
$self->run_hook_script ('post-restart', $task, $logfd);
} else { } else {
die "internal error - unknown mode '$mode'\n"; die "internal error - unknown mode '$mode'\n";
} }
@ -1011,6 +1014,7 @@ sub exec_backup_task {
$plugin->start_vm ($task, $vmid); $plugin->start_vm ($task, $vmid);
} }
} }
$self->run_hook_script ('post-restart', $task, $logfd);
}; };
my $err = $@; my $err = $@;
if ($err) { if ($err) {

2
debian/changelog.Debian vendored
View File

@ -8,6 +8,8 @@ pve-manager (4.1-34) unstable; urgency=medium
* add enableKeyEvents to combogrid * add enableKeyEvents to combogrid
* fix #949: add post-restart hook to vzdump
-- Proxmox Support Team <support@proxmox.com> Fri, 22 Apr 2016 09:15:07 +0200 -- Proxmox Support Team <support@proxmox.com> Fri, 22 Apr 2016 09:15:07 +0200
pve-manager (4.1-33) unstable; urgency=medium pve-manager (4.1-33) unstable; urgency=medium

3
vzdump-hook-script.pl
View File

@ -25,7 +25,8 @@ if ($phase eq 'job-start' ||
$phase eq 'backup-abort' || $phase eq 'backup-abort' ||
$phase eq 'log-end' || $phase eq 'log-end' ||
$phase eq 'pre-stop' || $phase eq 'pre-stop' ||
$phase eq 'pre-restart') { $phase eq 'pre-restart' ||
$phase eq 'post-restart') {
my $mode = shift; # stop/suspend/snapshot my $mode = shift; # stop/suspend/snapshot