From 1d14c31658b58bb624e551bc72d5c580d4827341 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 2 Mar 2021 08:00:10 +0100 Subject: [PATCH] Revert "tape: also abort backup/restore on server shutdown" This reverts commit 9bd81bb38403032f00c7c7bf224e74809590004e. Turns out this is not really a good idea. --- src/api2/tape/backup.rs | 5 ----- src/api2/tape/restore.rs | 2 -- src/tape/drive/mod.rs | 3 --- 3 files changed, 10 deletions(-) diff --git a/src/api2/tape/backup.rs b/src/api2/tape/backup.rs index af711393..eeef5528 100644 --- a/src/api2/tape/backup.rs +++ b/src/api2/tape/backup.rs @@ -366,7 +366,6 @@ pub fn backup_snapshot( loop { worker.check_abort()?; - crate::tools::fail_on_shutdown()?; // test is we have remaining chunks if chunk_iter.peek().is_none() { @@ -376,7 +375,6 @@ pub fn backup_snapshot( let uuid = pool_writer.load_writable_media(worker)?; worker.check_abort()?; - crate::tools::fail_on_shutdown()?; let (leom, _bytes) = pool_writer.append_chunk_archive(worker, &datastore, &mut chunk_iter)?; @@ -386,12 +384,10 @@ pub fn backup_snapshot( } worker.check_abort()?; - crate::tools::fail_on_shutdown()?; let uuid = pool_writer.load_writable_media(worker)?; worker.check_abort()?; - crate::tools::fail_on_shutdown()?; let (done, _bytes) = pool_writer.append_snapshot_archive(worker, &snapshot_reader)?; @@ -400,7 +396,6 @@ pub fn backup_snapshot( pool_writer.set_media_status_full(&uuid)?; worker.check_abort()?; - crate::tools::fail_on_shutdown()?; pool_writer.load_writable_media(worker)?; let (done, _bytes) = pool_writer.append_snapshot_archive(worker, &snapshot_reader)?; diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs index 87b8d647..e506c36c 100644 --- a/src/api2/tape/restore.rs +++ b/src/api2/tape/restore.rs @@ -378,7 +378,6 @@ fn restore_chunk_archive<'a>( while let Some((digest, blob)) = decoder.next_chunk()? { worker.check_abort()?; - crate::tools::fail_on_shutdown()?; if let Some(datastore) = datastore { let chunk_exists = datastore.cond_touch_chunk(&digest, false)?; @@ -478,7 +477,6 @@ fn try_restore_snapshot_archive( loop { worker.check_abort()?; - crate::tools::fail_on_shutdown()?; let entry = match decoder.next() { None => break, diff --git a/src/tape/drive/mod.rs b/src/tape/drive/mod.rs index a0b9454a..ba63f4d4 100644 --- a/src/tape/drive/mod.rs +++ b/src/tape/drive/mod.rs @@ -386,7 +386,6 @@ pub fn request_and_load_media( loop { worker.check_abort()?; - crate::tools::fail_on_shutdown()?; let mut handle = match drive_config.open() { Ok(handle) => handle, @@ -398,7 +397,6 @@ pub fn request_and_load_media( } for _ in 0..50 { // delay 5 seconds worker.check_abort()?; - crate::tools::fail_on_shutdown()?; std::thread::sleep(std::time::Duration::from_millis(100)); } continue; @@ -443,7 +441,6 @@ pub fn request_and_load_media( // eprintln!("read label failed - test again in 5 secs"); for _ in 0..50 { // delay 5 seconds worker.check_abort()?; - crate::tools::fail_on_shutdown()?; std::thread::sleep(std::time::Duration::from_millis(100)); } }