datastore: move blob loading into BackupDir impl and adapt call sites

data blobs can only appear in a BackupDir (snapshot) in the backup
hierachy, so makes more sense that it lives in there.

As it wasn't widely used anyway it's easy to move the single
non-package call site over to the new one directly and drop the
implementation from Datastore completely.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2022-04-24 19:09:38 +02:00
parent f03649b8f3
commit 1eef52c206
3 changed files with 16 additions and 16 deletions

View File

@ -41,11 +41,10 @@ impl VerifyWorker {
}
fn verify_blob(
datastore: Arc<DataStore>,
backup_dir: &BackupDir,
info: &FileInfo,
) -> Result<(), Error> {
let blob = datastore.load_blob(backup_dir, &info.filename)?;
let blob = backup_dir.load_blob(&info.filename)?;
let raw_size = blob.raw_size();
if raw_size != info.size {
@ -399,7 +398,7 @@ pub fn verify_backup_dir_with_lock(
match archive_type(&info.filename)? {
ArchiveType::FixedIndex => verify_fixed_index(verify_worker, backup_dir, info),
ArchiveType::DynamicIndex => verify_dynamic_index(verify_worker, backup_dir, info),
ArchiveType::Blob => verify_blob(verify_worker.datastore.clone(), backup_dir, info),
ArchiveType::Blob => verify_blob(backup_dir, info),
}
});