[pbs-devel] [PATCH proxmox-backup] api2: tape/restore: commit temporary catalog at the end
Dominik Csapak
d.csapak at proxmox.com
Tue Jul 20 10:55:11 CEST 2021
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 at proxmox.com>
---
this should reduce the number of commits quite a bit, and make my
previous series[0] work ok
0: https://lists.proxmox.com/pipermail/pbs-devel/2021-July/003711.html
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 f959a856..8a8e8a36 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(())
@@ -1153,8 +1155,6 @@ fn restore_archive<'a>(
_ => bail!("unknown content magic {:?}", header.content_magic),
}
- catalog.commit()?;
-
Ok(())
}
--
2.30.2
More information about the pbs-devel
mailing list