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

api2/tape/restore: remove unnecessary params from (try_)restore_snapshot_archive

Browse Source 
we do not need them

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-05-05 12:09:14 +02:00 committed by Dietmar Maurer
parent c4a04b7c62
commit b7b9a57425
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api2/tape/restore.rs
View File

@ -503,8 +503,6 @@ fn restore_archive<'a>(
let datastore_name = archive_header.store; let datastore_name = archive_header.store;
let snapshot = archive_header.snapshot; let snapshot = archive_header.snapshot;
let checked_chunks = checked_chunks_map.entry(datastore_name.clone()).or_insert(HashSet::new());
task_log!(worker, "File {}: snapshot archive {}:{}", current_file_number, datastore_name, snapshot); task_log!(worker, "File {}: snapshot archive {}:{}", current_file_number, datastore_name, snapshot);
let backup_dir: BackupDir = snapshot.parse()?; let backup_dir: BackupDir = snapshot.parse()?;
@ -531,7 +529,7 @@ fn restore_archive<'a>(
if is_new { if is_new {
task_log!(worker, "restore snapshot {}", backup_dir); task_log!(worker, "restore snapshot {}", backup_dir);
match restore_snapshot_archive(worker.clone(), reader, &path, &datastore, checked_chunks) { match restore_snapshot_archive(worker.clone(), reader, &path) {
Err(err) => { Err(err) => {
std::fs::remove_dir_all(&path)?; std::fs::remove_dir_all(&path)?;
bail!("restore snapshot {} failed - {}", backup_dir, err); bail!("restore snapshot {} failed - {}", backup_dir, err);
@ -774,13 +772,11 @@ fn restore_snapshot_archive<'a>(
worker: Arc<WorkerTask>, worker: Arc<WorkerTask>,
reader: Box<dyn 'a + TapeRead>, reader: Box<dyn 'a + TapeRead>,
snapshot_path: &Path, snapshot_path: &Path,
datastore: &DataStore,
checked_chunks: &mut HashSet<[u8;32]>,
) -> Result<bool, Error> { ) -> Result<bool, Error> {
let mut decoder = pxar::decoder::sync::Decoder::from_std(reader)?; let mut decoder = pxar::decoder::sync::Decoder::from_std(reader)?;
match try_restore_snapshot_archive(worker, &mut decoder, snapshot_path, datastore, checked_chunks) { match try_restore_snapshot_archive(worker, &mut decoder, snapshot_path) {
Ok(()) => Ok(true), Ok(_) => Ok(true),
Err(err) => { Err(err) => {
let reader = decoder.input(); let reader = decoder.input();
@ -804,8 +800,6 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
worker: Arc<WorkerTask>, worker: Arc<WorkerTask>,
decoder: &mut pxar::decoder::sync::Decoder<R>, decoder: &mut pxar::decoder::sync::Decoder<R>,
snapshot_path: &Path, snapshot_path: &Path,
_datastore: &DataStore,
_checked_chunks: &mut HashSet<[u8;32]>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let _root = match decoder.next() { let _root = match decoder.next() {