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

api: admin/datastore: add tar support for pxar_file_download

Browse Source 
by using the newly added 'create_tar' and the 'ZstdEncoder'

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-04-12 13:04:17 +02:00 committed by Wolfgang Bumiller
parent 23af572d3f
commit 984ddb2ff2
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -105,6 +105,7 @@ proxmox-uuid = "1"
proxmox-serde = "0.1" proxmox-serde = "0.1"
proxmox-shared-memory = "0.2" proxmox-shared-memory = "0.2"
proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] } proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
proxmox-compression = "0.1"
proxmox-acme-rs = "0.4" proxmox-acme-rs = "0.4"

33
src/api2/admin/datastore.rs
View File

@ -12,6 +12,7 @@ use hyper::{header, Body, Response, StatusCode};
use serde_json::{json, Value}; use serde_json::{json, Value};
use tokio_stream::wrappers::ReceiverStream; use tokio_stream::wrappers::ReceiverStream;
use proxmox_compression::zstd::ZstdEncoder;
use proxmox_sys::sortable; use proxmox_sys::sortable;
use proxmox_sys::fs::{ use proxmox_sys::fs::{
file_read_firstline, file_read_optional_string, replace_file, CreateOptions, file_read_firstline, file_read_optional_string, replace_file, CreateOptions,
@ -40,7 +41,7 @@ use pbs_api_types::{ Authid, BackupContent, Counts, CryptMode,
PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_VERIFY, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_VERIFY,
}; };
use pbs_client::pxar::create_zip; use pbs_client::pxar::{create_tar, create_zip};
use pbs_datastore::{ use pbs_datastore::{
check_backup_owner, DataStore, BackupDir, BackupGroup, StoreProgress, LocalChunkReader, check_backup_owner, DataStore, BackupDir, BackupGroup, StoreProgress, LocalChunkReader,
CATALOG_NAME, task_tracking CATALOG_NAME, task_tracking
@ -1433,6 +1434,7 @@ pub const API_METHOD_PXAR_FILE_DOWNLOAD: ApiMethod = ApiMethod::new(
("backup-id", false, &BACKUP_ID_SCHEMA), ("backup-id", false, &BACKUP_ID_SCHEMA),
("backup-time", false, &BACKUP_TIME_SCHEMA), ("backup-time", false, &BACKUP_TIME_SCHEMA),
("filepath", false, &StringSchema::new("Base64 encoded path").schema()), ("filepath", false, &StringSchema::new("Base64 encoded path").schema()),
("tar", true, &BooleanSchema::new("Download as .tar.zst").schema()),
]), ]),
) )
).access(None, &Permission::Privilege( ).access(None, &Permission::Privilege(
@ -1461,6 +1463,8 @@ pub fn pxar_file_download(
let backup_id = required_string_param(&param, "backup-id")?; let backup_id = required_string_param(&param, "backup-id")?;
let backup_time = required_integer_param(&param, "backup-time")?; let backup_time = required_integer_param(&param, "backup-time")?;
let tar = param["tar"].as_bool().unwrap_or(false);
let backup_dir = BackupDir::new(backup_type, backup_id, backup_time)?; let backup_dir = BackupDir::new(backup_type, backup_id, backup_time)?;
check_priv_or_backup_owner(&datastore, backup_dir.group(), &auth_id, PRIV_DATASTORE_READ)?; check_priv_or_backup_owner(&datastore, backup_dir.group(), &auth_id, PRIV_DATASTORE_READ)?;
@ -1520,15 +1524,26 @@ pub fn pxar_file_download(
}), }),
), ),
EntryKind::Directory => { EntryKind::Directory => {
let (sender, receiver) = tokio::sync::mpsc::channel(100); let (sender, receiver) = tokio::sync::mpsc::channel::<Result<_, Error>>(100);
let channelwriter = AsyncChannelWriter::new(sender, 1024 * 1024); let channelwriter = AsyncChannelWriter::new(sender, 1024 * 1024);
proxmox_rest_server::spawn_internal_task( if tar {
create_zip(channelwriter, decoder, path.clone(), false) proxmox_rest_server::spawn_internal_task(
); create_tar(channelwriter, decoder, path.clone(), false)
Body::wrap_stream(ReceiverStream::new(receiver).map_err(move |err| { );
eprintln!("error during streaming of zip '{:?}' - {}", path, err); let zstdstream = ZstdEncoder::new(ReceiverStream::new(receiver))?;
err Body::wrap_stream(zstdstream.map_err(move |err| {
})) eprintln!("error during streaming of tar.zst '{:?}' - {}", path, err);
err
}))
} else {
proxmox_rest_server::spawn_internal_task(
create_zip(channelwriter, decoder, path.clone(), false)
);
Body::wrap_stream(ReceiverStream::new(receiver).map_err(move |err| {
eprintln!("error during streaming of zip '{:?}' - {}", path, err);
err
}))
}
} }
other => bail!("cannot download file of type {:?}", other), other => bail!("cannot download file of type {:?}", other),
}; };