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

api2: tape/restore: commit temporary catalog at the end 

in 'restore_archive', we reach that 'catalog.commit()' for
* every skipped snapshot (we already call 'commit_if_large' then before)
* every skipped chunk archive (no change in catalog since we do not read
  the chunk archive in that case)
* after reading a catalog (no change in catalog)

in all other cases, we call 'commit_if_large' and return early,
meaning that the 'commit' there was executed too often and
unnecessary, so move it after the loop over the files, before
finishing the temporary database.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-07-20 10:55:11 +02:00 committed by Dietmar Maurer
parent a5f30a562b
commit 76e8565076
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -998,6 +998,8 @@ pub fn restore_media(
restore_archive(worker.clone(), reader, current_file_number, target, &mut catalog, checked_chunks_map, verbose)?; restore_archive(worker.clone(), reader, current_file_number, target, &mut catalog, checked_chunks_map, verbose)?;
} }
catalog.commit()?;
MediaCatalog::finish_temporary_database(status_path, &media_id.label.uuid, true)?; MediaCatalog::finish_temporary_database(status_path, &media_id.label.uuid, true)?;
Ok(()) Ok(())
@ -1150,8 +1152,6 @@ fn restore_archive<'a>(
_ => bail!("unknown content magic {:?}", header.content_magic), _ => bail!("unknown content magic {:?}", header.content_magic),
} }
catalog.commit()?;
Ok(()) Ok(())
} }