mirror of
git://git.proxmox.com/git/proxmox-backup.git
synced 2025-01-06 13:18:00 +03:00
client: make helper to get remote pxar reader reusable
Move the `get_remote_pxar_reader` helper function so it can be reused also for getting the metadata archive reader instance for the catalog dump. No functional changes. Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
parent
3a6755363b
commit
3e6318a535
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::os::unix::ffi::OsStrExt;
|
use std::os::unix::ffi::OsStrExt;
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::path::PathBuf;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use anyhow::{bail, format_err, Context, Error};
|
use anyhow::{bail, format_err, Context, Error};
|
||||||
use nix::sys::stat::Mode;
|
use nix::sys::stat::Mode;
|
||||||
@ -15,6 +15,13 @@ use pxar::{mode, Entry, EntryKind, Metadata};
|
|||||||
|
|
||||||
use pbs_datastore::catalog::{ArchiveEntry, DirEntryAttribute};
|
use pbs_datastore::catalog::{ArchiveEntry, DirEntryAttribute};
|
||||||
|
|
||||||
|
use pbs_datastore::dynamic_index::{BufferedDynamicReader, LocalDynamicReadAt};
|
||||||
|
use pbs_datastore::index::IndexFile;
|
||||||
|
use pbs_datastore::BackupManifest;
|
||||||
|
use pbs_tools::crypt_config::CryptConfig;
|
||||||
|
|
||||||
|
use crate::{BackupReader, RemoteChunkReader};
|
||||||
|
|
||||||
/// Get the file permissions as `nix::Mode`
|
/// Get the file permissions as `nix::Mode`
|
||||||
pub(crate) fn perms_from_metadata(meta: &Metadata) -> Result<Mode, Error> {
|
pub(crate) fn perms_from_metadata(meta: &Metadata) -> Result<Mode, Error> {
|
||||||
let mode = meta.stat.get_permission_bits();
|
let mode = meta.stat.get_permission_bits();
|
||||||
@ -375,3 +382,28 @@ pub fn handle_root_with_optional_format_version_prelude<R: pxar::decoder::SeqRea
|
|||||||
_ => bail!("unexpected entry kind {:?}", first.kind()),
|
_ => bail!("unexpected entry kind {:?}", first.kind()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_remote_pxar_reader(
|
||||||
|
archive_name: &str,
|
||||||
|
client: Arc<BackupReader>,
|
||||||
|
manifest: &BackupManifest,
|
||||||
|
crypt_config: Option<Arc<CryptConfig>>,
|
||||||
|
) -> Result<(LocalDynamicReadAt<RemoteChunkReader>, u64), Error> {
|
||||||
|
let index = client
|
||||||
|
.download_dynamic_index(manifest, archive_name)
|
||||||
|
.await?;
|
||||||
|
let most_used = index.find_most_used_chunks(8);
|
||||||
|
|
||||||
|
let file_info = manifest.lookup_file_info(archive_name)?;
|
||||||
|
let chunk_reader = RemoteChunkReader::new(
|
||||||
|
client.clone(),
|
||||||
|
crypt_config,
|
||||||
|
file_info.chunk_crypt_mode(),
|
||||||
|
most_used,
|
||||||
|
);
|
||||||
|
|
||||||
|
let reader = BufferedDynamicReader::new(index, chunk_reader);
|
||||||
|
let archive_size = reader.archive_size();
|
||||||
|
|
||||||
|
Ok((LocalDynamicReadAt::new(reader), archive_size))
|
||||||
|
}
|
||||||
|
@ -22,6 +22,7 @@ use pxar::accessor::aio::Accessor;
|
|||||||
use pxar::decoder::aio::Decoder;
|
use pxar::decoder::aio::Decoder;
|
||||||
|
|
||||||
use pbs_api_types::{file_restore::FileRestoreFormat, BackupDir, BackupNamespace, CryptMode};
|
use pbs_api_types::{file_restore::FileRestoreFormat, BackupDir, BackupNamespace, CryptMode};
|
||||||
|
use pbs_client::pxar::tools::get_remote_pxar_reader;
|
||||||
use pbs_client::pxar::{create_tar, create_zip, extract_sub_dir, extract_sub_dir_seq};
|
use pbs_client::pxar::{create_tar, create_zip, extract_sub_dir, extract_sub_dir_seq};
|
||||||
use pbs_client::tools::{
|
use pbs_client::tools::{
|
||||||
complete_group_or_snapshot, complete_repository, connect, extract_repository_from_value,
|
complete_group_or_snapshot, complete_repository, connect, extract_repository_from_value,
|
||||||
@ -34,9 +35,9 @@ use pbs_client::tools::{
|
|||||||
};
|
};
|
||||||
use pbs_client::{BackupReader, BackupRepository, RemoteChunkReader};
|
use pbs_client::{BackupReader, BackupRepository, RemoteChunkReader};
|
||||||
use pbs_datastore::catalog::{ArchiveEntry, CatalogReader, DirEntryAttribute};
|
use pbs_datastore::catalog::{ArchiveEntry, CatalogReader, DirEntryAttribute};
|
||||||
use pbs_datastore::dynamic_index::{BufferedDynamicReader, LocalDynamicReadAt};
|
use pbs_datastore::dynamic_index::BufferedDynamicReader;
|
||||||
use pbs_datastore::index::IndexFile;
|
use pbs_datastore::index::IndexFile;
|
||||||
use pbs_datastore::{BackupManifest, CATALOG_NAME};
|
use pbs_datastore::CATALOG_NAME;
|
||||||
use pbs_key_config::decrypt_key;
|
use pbs_key_config::decrypt_key;
|
||||||
use pbs_tools::crypt_config::CryptConfig;
|
use pbs_tools::crypt_config::CryptConfig;
|
||||||
|
|
||||||
@ -358,31 +359,6 @@ async fn list(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_remote_pxar_reader(
|
|
||||||
archive_name: &str,
|
|
||||||
client: Arc<BackupReader>,
|
|
||||||
manifest: &BackupManifest,
|
|
||||||
crypt_config: Option<Arc<CryptConfig>>,
|
|
||||||
) -> Result<(LocalDynamicReadAt<RemoteChunkReader>, u64), Error> {
|
|
||||||
let index = client
|
|
||||||
.download_dynamic_index(manifest, archive_name)
|
|
||||||
.await?;
|
|
||||||
let most_used = index.find_most_used_chunks(8);
|
|
||||||
|
|
||||||
let file_info = manifest.lookup_file_info(archive_name)?;
|
|
||||||
let chunk_reader = RemoteChunkReader::new(
|
|
||||||
client.clone(),
|
|
||||||
crypt_config,
|
|
||||||
file_info.chunk_crypt_mode(),
|
|
||||||
most_used,
|
|
||||||
);
|
|
||||||
|
|
||||||
let reader = BufferedDynamicReader::new(index, chunk_reader);
|
|
||||||
let archive_size = reader.archive_size();
|
|
||||||
|
|
||||||
Ok((LocalDynamicReadAt::new(reader), archive_size))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[api(
|
#[api(
|
||||||
input: {
|
input: {
|
||||||
properties: {
|
properties: {
|
||||||
|
Loading…
Reference in New Issue
Block a user