api2/tape/backup: wait indefinitely for lock in scheduled backup jobs
so that a user can schedule multiple backup jobs onto a single media pool without having to consider timing them apart this makes sense since we can backup multiple datastores onto the same media-set but can only specify one datastore per backup job Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
parent
4abd4dbe38
commit
54fcb7f5d8
@ -5,6 +5,7 @@ use anyhow::{bail, format_err, Error};
|
|||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
|
||||||
use proxmox::{
|
use proxmox::{
|
||||||
|
try_block,
|
||||||
api::{
|
api::{
|
||||||
api,
|
api,
|
||||||
RpcEnvironment,
|
RpcEnvironment,
|
||||||
@ -177,8 +178,15 @@ pub fn do_tape_backup_job(
|
|||||||
|
|
||||||
let (drive_config, _digest) = config::drive::config()?;
|
let (drive_config, _digest) = config::drive::config()?;
|
||||||
|
|
||||||
// early check/lock before starting worker
|
// for scheduled jobs we acquire the lock later in the worker
|
||||||
let drive_lock = lock_tape_device(&drive_config, &setup.drive)?;
|
let drive_lock = if schedule.is_some() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(lock_tape_device(&drive_config, &setup.drive)?)
|
||||||
|
};
|
||||||
|
|
||||||
|
let notify_user = setup.notify_user.as_ref().unwrap_or_else(|| &Userid::root_userid());
|
||||||
|
let email = lookup_user_email(notify_user);
|
||||||
|
|
||||||
let upid_str = WorkerTask::new_thread(
|
let upid_str = WorkerTask::new_thread(
|
||||||
&worker_type,
|
&worker_type,
|
||||||
@ -186,26 +194,37 @@ pub fn do_tape_backup_job(
|
|||||||
auth_id.clone(),
|
auth_id.clone(),
|
||||||
false,
|
false,
|
||||||
move |worker| {
|
move |worker| {
|
||||||
let _drive_lock = drive_lock; // keep lock guard
|
|
||||||
|
|
||||||
set_tape_device_state(&setup.drive, &worker.upid().to_string())?;
|
|
||||||
job.start(&worker.upid().to_string())?;
|
job.start(&worker.upid().to_string())?;
|
||||||
|
let mut drive_lock = drive_lock;
|
||||||
|
|
||||||
|
let (job_result, summary) = match try_block!({
|
||||||
|
if schedule.is_some() {
|
||||||
|
// for scheduled tape backup jobs, we wait indefinitely for the lock
|
||||||
|
task_log!(worker, "waiting for drive lock...");
|
||||||
|
loop {
|
||||||
|
if let Ok(lock) = lock_tape_device(&drive_config, &setup.drive) {
|
||||||
|
drive_lock = Some(lock);
|
||||||
|
break;
|
||||||
|
} // ignore errors
|
||||||
|
|
||||||
|
worker.check_abort()?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
set_tape_device_state(&setup.drive, &worker.upid().to_string())?;
|
||||||
|
|
||||||
task_log!(worker,"Starting tape backup job '{}'", job_id);
|
task_log!(worker,"Starting tape backup job '{}'", job_id);
|
||||||
if let Some(event_str) = schedule {
|
if let Some(event_str) = schedule {
|
||||||
task_log!(worker,"task triggered by schedule '{}'", event_str);
|
task_log!(worker,"task triggered by schedule '{}'", event_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
let notify_user = setup.notify_user.as_ref().unwrap_or_else(|| &Userid::root_userid());
|
backup_worker(
|
||||||
let email = lookup_user_email(notify_user);
|
|
||||||
|
|
||||||
let (job_result, summary) = match backup_worker(
|
|
||||||
&worker,
|
&worker,
|
||||||
datastore,
|
datastore,
|
||||||
&pool_config,
|
&pool_config,
|
||||||
&setup,
|
&setup,
|
||||||
email.clone(),
|
email.clone(),
|
||||||
) {
|
)
|
||||||
|
}) {
|
||||||
Ok(summary) => (Ok(()), summary),
|
Ok(summary) => (Ok(()), summary),
|
||||||
Err(err) => (Err(err), Default::default()),
|
Err(err) => (Err(err), Default::default()),
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user