From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E4D9176960 for ; Fri, 23 Apr 2021 14:57:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D95B82950A for ; Fri, 23 Apr 2021 14:57:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2A3FD29502 for ; Fri, 23 Apr 2021 14:57:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 02E5343508 for ; Fri, 23 Apr 2021 14:57:20 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 23 Apr 2021 14:57:18 +0200 Message-Id: <20210423125718.574-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup] api2/tape/backup: list backed up snapshots on failed backup notification X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 12:57:20 -0000 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 --- src/api2/tape/backup.rs | 25 ++++++++++++------------- src/server/email_notifications.rs | 6 ++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/api2/tape/backup.rs b/src/api2/tape/backup.rs index bce0fbcc..4dc35945 100644 --- a/src/api2/tape/backup.rs +++ b/src/api2/tape/backup.rs @@ -197,7 +197,8 @@ pub fn do_tape_backup_job( job.start(&worker.upid().to_string())?; 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() { // for scheduled tape backup jobs, we wait indefinitely for the 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); } + backup_worker( &worker, datastore, &pool_config, &setup, email.clone(), + &mut summary, ) - }) { - Ok(summary) => (Ok(()), summary), - Err(err) => (Err(err), Default::default()), - }; + }); let status = worker.create_state(&job_result); @@ -365,16 +365,15 @@ pub fn backup( let _drive_lock = drive_lock; // keep lock guard 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, datastore, &pool_config, &setup, email.clone(), - ) { - Ok(summary) => (Ok(()), summary), - Err(err) => (Err(err), Default::default()), - }; + &mut summary, + ); if let Some(email) = email { if let Err(err) = crate::server::send_tape_backup_status( @@ -403,11 +402,11 @@ fn backup_worker( pool_config: &MediaPoolConfig, setup: &TapeBackupJobSetup, email: Option, -) -> Result { + summary: &mut TapeBackupJobSummary, +) -> Result<(), Error> { let status_path = Path::new(TAPE_STATUS_DIR); let start = std::time::Instant::now(); - let mut summary: TapeBackupJobSummary = Default::default(); task_log!(worker, "update media online status"); let changer_name = update_media_online_status(&setup.drive)?; @@ -531,7 +530,7 @@ fn backup_worker( summary.duration = start.elapsed(); - Ok(summary) + Ok(()) } // Try to update the the media online status diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs index 4e07ed13..8c72250e 100644 --- a/src/server/email_notifications.rs +++ b/src/server/email_notifications.rs @@ -176,7 +176,13 @@ Datastore: {{job.store}} Tape Pool: {{job.pool}} Tape Drive: {{job.drive}} +{{#if snapshot-list ~}} +Snapshots included: +{{#each snapshot-list~}} +{{this}} +{{/each~}} +{{/if}} Tape Backup failed: {{error}} -- 2.20.1