From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 2/3] fix #4053: enable 'skip-missed' behaviour also for change from disabled->enabled
Date: Wed, 1 Jun 2022 12:23:19 +0200 [thread overview]
Message-ID: <20220601102321.4093592-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220601102321.4093592-1-d.csapak@proxmox.com>
so that if 'persistent' is configured to off, we don't immediately run
the job
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
PVE/API2/Backup.pm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm
index 7b00567a..251a892d 100644
--- a/PVE/API2/Backup.pm
+++ b/PVE/API2/Backup.pm
@@ -452,6 +452,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,
'skip-missed' => 1,
@@ -465,15 +467,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 && $job->{'skip-missed'}) {
+ $need_run_time_update = 1;
+ }
+
$job->{all} = 1 if (defined($job->{exclude}) && !defined($job->{pool}));
if (defined($param->{vmid})) {
@@ -491,7 +499,7 @@ __PACKAGE__->register_method({
PVE::VZDump::verify_vzdump_parameters($job, 1);
- if ($schedule_updated) {
+ if ($need_run_time_update) {
PVE::Jobs::updated_job_schedule($id, 'vzdump');
}
--
2.30.2
next prev parent reply other threads:[~2022-06-01 10:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-01 10:23 [pve-devel] [PATCH manager/docs] handle missed jobs better Dominik Csapak
2022-06-01 10:23 ` [pve-devel] [PATCH manager 1/3] fix #4026: add 'skip-missed' option for jobs Dominik Csapak
2022-06-01 10:23 ` Dominik Csapak [this message]
2022-06-01 10:23 ` [pve-devel] [PATCH manager 3/3] ui: dc/Backup: add 'skip-missed' checkbox Dominik Csapak
2022-06-01 10:23 ` [pve-devel] [PATCH docs 1/1] vzdump: add section about 'skip-missed' Dominik Csapak
2022-06-02 7:07 ` [pve-devel] [PATCH manager/docs] handle missed jobs better Thomas Lamprecht
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=20220601102321.4093592-3-d.csapak@proxmox.com \
--to=d.csapak@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