tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api2/tape/backup: list backed up snapshots on failed backup notification 

if a backup task failed (e.g. it was aborted), show the snapshots
which were successfully backed up in the notification

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-04-23 14:57:18 +02:00 committed by Dietmar Maurer
parent 69e5ba29c4
commit 4ca3f0c6ae
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api2/tape/backup.rs
View File

@ -197,7 +197,8 @@ pub fn do_tape_backup_job(
job.start(&worker.upid().to_string())?; job.start(&worker.upid().to_string())?;
let mut drive_lock = drive_lock; let mut drive_lock = drive_lock;
let (job_result, summary) = match try_block!({ let mut summary = Default::default();
let job_result = try_block!({
if schedule.is_some() { if schedule.is_some() {
// for scheduled tape backup jobs, we wait indefinitely for the lock // for scheduled tape backup jobs, we wait indefinitely for the lock
task_log!(worker, "waiting for drive lock..."); task_log!(worker, "waiting for drive lock...");
@ -217,17 +218,16 @@ pub fn do_tape_backup_job(
task_log!(worker,"task triggered by schedule '{}'", event_str); task_log!(worker,"task triggered by schedule '{}'", event_str);
} }
backup_worker( backup_worker(
&worker, &worker,
datastore, datastore,
&pool_config, &pool_config,
&setup, &setup,
email.clone(), email.clone(),
&mut summary,
) )
}) { });
Ok(summary) => (Ok(()), summary),
Err(err) => (Err(err), Default::default()),
};
let status = worker.create_state(&job_result); let status = worker.create_state(&job_result);
@ -365,16 +365,15 @@ pub fn backup(
let _drive_lock = drive_lock; // keep lock guard let _drive_lock = drive_lock; // keep lock guard
set_tape_device_state(&setup.drive, &worker.upid().to_string())?; set_tape_device_state(&setup.drive, &worker.upid().to_string())?;
let (job_result, summary) = match backup_worker( let mut summary = Default::default();
let job_result = backup_worker(
&worker, &worker,
datastore, datastore,
&pool_config, &pool_config,
&setup, &setup,
email.clone(), email.clone(),
) { &mut summary,
Ok(summary) => (Ok(()), summary), );
Err(err) => (Err(err), Default::default()),
};
if let Some(email) = email { if let Some(email) = email {
if let Err(err) = crate::server::send_tape_backup_status( if let Err(err) = crate::server::send_tape_backup_status(
@ -403,11 +402,11 @@ fn backup_worker(
pool_config: &MediaPoolConfig, pool_config: &MediaPoolConfig,
setup: &TapeBackupJobSetup, setup: &TapeBackupJobSetup,
email: Option<String>, email: Option<String>,
) -> Result<TapeBackupJobSummary, Error> { summary: &mut TapeBackupJobSummary,
) -> Result<(), Error> {
let status_path = Path::new(TAPE_STATUS_DIR); let status_path = Path::new(TAPE_STATUS_DIR);
let start = std::time::Instant::now(); let start = std::time::Instant::now();
let mut summary: TapeBackupJobSummary = Default::default();
task_log!(worker, "update media online status"); task_log!(worker, "update media online status");
let changer_name = update_media_online_status(&setup.drive)?; let changer_name = update_media_online_status(&setup.drive)?;
@ -531,7 +530,7 @@ fn backup_worker(
summary.duration = start.elapsed(); summary.duration = start.elapsed();
Ok(summary) Ok(())
} }
// Try to update the the media online status // Try to update the the media online status

6
src/server/email_notifications.rs
View File

@ -176,7 +176,13 @@ Datastore: {{job.store}}
Tape Pool: {{job.pool}} Tape Pool: {{job.pool}}
Tape Drive: {{job.drive}} Tape Drive: {{job.drive}}
{{#if snapshot-list ~}}
Snapshots included:
{{#each snapshot-list~}}
{{this}}
{{/each~}}
{{/if}}
Tape Backup failed: {{error}} Tape Backup failed: {{error}}