From 1ef6e8b6a71eeb98898fa5af0619048368727435 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Mon, 7 Jun 2021 17:35:28 +0200 Subject: [PATCH] replace AsyncIndexReader with SeekableCachedChunkReader admin/datastore reads linearly only, so no need for cache (capacity of 1 basically means no cache except for the currently active chunk). mount can do random access too, so cache last 8 chunks for possibly a mild performance improvement. Signed-off-by: Stefan Reiter --- src/api2/admin/datastore.rs | 4 ++-- src/bin/proxmox_backup_client/mount.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index e0dfeecc..7b7f3102 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1182,7 +1182,7 @@ pub fn download_file_decoded( manifest.verify_file(&file_name, &csum, size)?; let chunk_reader = LocalChunkReader::new(datastore, None, CryptMode::None); - let reader = AsyncIndexReader::new(index, chunk_reader); + let reader = CachedChunkReader::new(chunk_reader, index, 1).seekable(); Body::wrap_stream(AsyncReaderStream::new(reader) .map_err(move |err| { eprintln!("error during streaming of '{:?}' - {}", path, err); @@ -1197,7 +1197,7 @@ pub fn download_file_decoded( manifest.verify_file(&file_name, &csum, size)?; let chunk_reader = LocalChunkReader::new(datastore, None, CryptMode::None); - let reader = AsyncIndexReader::new(index, chunk_reader); + let reader = CachedChunkReader::new(chunk_reader, index, 1).seekable(); Body::wrap_stream(AsyncReaderStream::with_buffer_size(reader, 4*1024*1024) .map_err(move |err| { eprintln!("error during streaming of '{:?}' - {}", path, err); diff --git a/src/bin/proxmox_backup_client/mount.rs b/src/bin/proxmox_backup_client/mount.rs index f3498e35..d0f04f89 100644 --- a/src/bin/proxmox_backup_client/mount.rs +++ b/src/bin/proxmox_backup_client/mount.rs @@ -25,7 +25,7 @@ use proxmox_backup::backup::{ BackupDir, BackupGroup, BufferedDynamicReader, - AsyncIndexReader, + CachedChunkReader, }; use proxmox_backup::client::*; @@ -281,7 +281,7 @@ async fn mount_do(param: Value, pipe: Option) -> Result { let index = client.download_fixed_index(&manifest, &server_archive_name).await?; let size = index.index_bytes(); let chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, file_info.chunk_crypt_mode(), HashMap::new()); - let reader = AsyncIndexReader::new(index, chunk_reader); + let reader = CachedChunkReader::new(chunk_reader, index, 8).seekable(); let name = &format!("{}:{}/{}", repo.to_string(), path, archive_name); let name_escaped = tools::systemd::escape_unit(name, false);