Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

fix #4053: don't run vzdump jobs when they change from disabled->enabled

Browse Source 
by updating the timestamp in the job state when enabled is changing
from 0 -> 1. We do it this way too in PBS for example, and is the more
sensible behaviour.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-06-13 15:24:09 +02:00 committed by Thomas Lamprecht
parent c61c192e17
commit 0c8d746815
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/API2/Backup.pm
View File

@ -454,6 +454,8 @@ __PACKAGE__->register_method({
die "no such vzdump job\n" if !$job || $job->{type} ne 'vzdump';
}
my $old_enabled = $job->{enabled} // 1;
my $deletable = {
comment => 1,
'repeat-missed' => 1,
@ -467,15 +469,21 @@ __PACKAGE__->register_method({
delete $job->{$k};
}
my $schedule_updated = 0;
my $need_run_time_update = 0;
if (defined($param->{schedule}) && $param->{schedule} ne $job->{schedule}) {
$schedule_updated = 1;
$need_run_time_update = 1;
}
foreach my $k (keys %$param) {
$job->{$k} = $param->{$k};
}
my $new_enabled = $job->{enabled} // 1;
if ($new_enabled && !$old_enabled) {
$need_run_time_update = 1;
}
$job->{all} = 1 if (defined($job->{exclude}) && !defined($job->{pool}));
if (defined($param->{vmid})) {
@ -493,7 +501,7 @@ __PACKAGE__->register_method({
PVE::VZDump::verify_vzdump_parameters($job, 1);
if ($schedule_updated) {
if ($need_run_time_update) {
PVE::Jobs::update_last_runtime($id, 'vzdump');
}