From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] server/jobstate: improve name of 'try_update_state_file'
Date: Mon, 26 Apr 2021 10:21:05 +0200 [thread overview]
Message-ID: <20210426082106.22024-1-d.csapak@proxmox.com> (raw)
and improve comment
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/config/sync.rs | 2 +-
src/api2/config/tape_backup_job.rs | 2 +-
src/api2/config/verify.rs | 2 +-
src/server/jobstate.rs | 5 +++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/api2/config/sync.rs b/src/api2/config/sync.rs
index aa8369fd..e784029a 100644
--- a/src/api2/config/sync.rs
+++ b/src/api2/config/sync.rs
@@ -346,7 +346,7 @@ pub fn update_sync_job(
sync::save_config(&config)?;
if schedule_changed {
- crate::server::jobstate::try_update_state_file("syncjob", &id)?;
+ crate::server::jobstate::update_job_last_run_time("syncjob", &id)?;
}
Ok(())
diff --git a/src/api2/config/tape_backup_job.rs b/src/api2/config/tape_backup_job.rs
index 776b89e4..22afeb6d 100644
--- a/src/api2/config/tape_backup_job.rs
+++ b/src/api2/config/tape_backup_job.rs
@@ -283,7 +283,7 @@ pub fn update_tape_backup_job(
config::tape_job::save_config(&config)?;
if schedule_changed {
- crate::server::jobstate::try_update_state_file("tape-backup-job", &id)?;
+ crate::server::jobstate::update_job_last_run_time("tape-backup-job", &id)?;
}
Ok(())
diff --git a/src/api2/config/verify.rs b/src/api2/config/verify.rs
index dee4c669..477cda89 100644
--- a/src/api2/config/verify.rs
+++ b/src/api2/config/verify.rs
@@ -282,7 +282,7 @@ pub fn update_verification_job(
verify::save_config(&config)?;
if schedule_changed {
- crate::server::jobstate::try_update_state_file("verificationjob", &id)?;
+ crate::server::jobstate::update_job_last_run_time("verificationjob", &id)?;
}
Ok(())
diff --git a/src/server/jobstate.rs b/src/server/jobstate.rs
index c62e58a2..30029bfd 100644
--- a/src/server/jobstate.rs
+++ b/src/server/jobstate.rs
@@ -152,8 +152,9 @@ pub fn create_state_file(jobtype: &str, jobname: &str) -> Result<(), Error> {
}
/// Tries to update the state file with the current time
-/// if the job is currently running, does nothing,
-pub fn try_update_state_file(jobtype: &str, jobname: &str) -> Result<(), Error> {
+/// if the job is currently running, does nothing.
+/// Intended for use when the schedule changes.
+pub fn update_job_last_run_time(jobtype: &str, jobname: &str) -> Result<(), Error> {
let mut job = match Job::new(jobtype, jobname) {
Ok(job) => job,
Err(_) => return Ok(()), // was locked (running), so do not update
--
2.20.1
next reply other threads:[~2021-04-26 8:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 8:21 Dominik Csapak [this message]
2021-04-26 8:21 ` [pbs-devel] [PATCH proxmox-backup 2/2] api2/config/datastore: use update_job_last_run_time for schedules Dominik Csapak
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=20210426082106.22024-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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