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

api: tape restore: use HumanByte for friendlier total/throughput reporting 

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-06-05 10:45:13 +02:00
parent 20a04cf07c
commit 7bc2e240b1
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/api2/tape/restore.rs
View File

@ -18,9 +18,10 @@ use proxmox_uuid::Uuid;
use pbs_api_types::{ use pbs_api_types::{
parse_ns_and_snapshot, print_ns_and_snapshot, Authid, BackupDir, BackupNamespace, CryptMode, parse_ns_and_snapshot, print_ns_and_snapshot, Authid, BackupDir, BackupNamespace, CryptMode,
Operation, TapeRestoreNamespace, Userid, DATASTORE_MAP_ARRAY_SCHEMA, DATASTORE_MAP_LIST_SCHEMA, HumanByte, Operation, TapeRestoreNamespace, Userid, DATASTORE_MAP_ARRAY_SCHEMA,
DRIVE_NAME_SCHEMA, MAX_NAMESPACE_DEPTH, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_MODIFY, DATASTORE_MAP_LIST_SCHEMA, DRIVE_NAME_SCHEMA, MAX_NAMESPACE_DEPTH, PRIV_DATASTORE_BACKUP,
PRIV_TAPE_READ, TAPE_RESTORE_NAMESPACE_SCHEMA, TAPE_RESTORE_SNAPSHOT_SCHEMA, UPID_SCHEMA, PRIV_DATASTORE_MODIFY, PRIV_TAPE_READ, TAPE_RESTORE_NAMESPACE_SCHEMA,
TAPE_RESTORE_SNAPSHOT_SCHEMA, UPID_SCHEMA,
}; };
use pbs_config::CachedUserInfo; use pbs_config::CachedUserInfo;
use pbs_datastore::dynamic_index::DynamicIndexReader; use pbs_datastore::dynamic_index::DynamicIndexReader;
@ -1205,14 +1206,12 @@ fn restore_partial_chunk_archive<'a>(
writer_pool.complete()?; writer_pool.complete()?;
let elapsed = start_time.elapsed()?.as_secs_f64(); let elapsed = start_time.elapsed()?.as_secs_f64();
let bytes = bytes.load(std::sync::atomic::Ordering::SeqCst) as f64;
let bytes = bytes.load(std::sync::atomic::Ordering::SeqCst);
task_log!( task_log!(
worker, worker,
"restored {} bytes ({:.2} MB/s)", "restored {} ({:.2}/s)",
bytes, HumanByte::new_decimal(bytes),
(bytes as f64) / (1_000_000.0 * elapsed) HumanByte::new_decimal(bytes / elapsed),
); );
Ok(count) Ok(count)
@ -1653,14 +1652,12 @@ fn restore_chunk_archive<'a>(
writer_pool.complete()?; writer_pool.complete()?;
let elapsed = start_time.elapsed()?.as_secs_f64(); let elapsed = start_time.elapsed()?.as_secs_f64();
let bytes = bytes.load(std::sync::atomic::Ordering::SeqCst) as f64;
let bytes = bytes.load(std::sync::atomic::Ordering::SeqCst);
task_log!( task_log!(
worker, worker,
"restored {} bytes ({:.2} MB/s)", "restored {} ({:.2}/s)",
bytes, HumanByte::new_decimal(bytes),
(bytes as f64) / (1_000_000.0 * elapsed) HumanByte::new_decimal(bytes / elapsed),
); );
Ok(Some(chunks)) Ok(Some(chunks))