From 76e856507683232b61ae876938118270cd5af3bd Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 20 Jul 2021 10:55:11 +0200 Subject: [PATCH] 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 --- src/api2/tape/restore.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs index 1b0bc03f..14b43c07 100644 --- a/src/api2/tape/restore.rs +++ b/src/api2/tape/restore.rs @@ -998,6 +998,8 @@ pub fn restore_media( 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)?; Ok(()) @@ -1150,8 +1152,6 @@ fn restore_archive<'a>( _ => bail!("unknown content magic {:?}", header.content_magic), } - catalog.commit()?; - Ok(()) }