/// The ReadChunk trait allows reading backup data chunks (local or remote)
pub trait ReadChunk {
+ /// Returns the encoded chunk data
+ fn read_raw_chunk(&mut self, digest:&[u8; 32]) -> Result<DataBlob, Error>;
+
/// Returns the decoded chunk data
fn read_chunk(&mut self, digest:&[u8; 32]) -> Result<Vec<u8>, Error>;
}
impl ReadChunk for LocalChunkReader {
- fn read_chunk(&mut self, digest:&[u8; 32]) -> Result<Vec<u8>, Error> {
+ fn read_raw_chunk(&mut self, digest:&[u8; 32]) -> Result<DataBlob, Error> {
let digest_str = proxmox::tools::digest_to_hex(digest);
println!("READ CHUNK {}", digest_str);
let chunk = DataBlob::from_raw(raw_data)?;
chunk.verify_crc()?;
+ Ok(chunk)
+ }
+
+ fn read_chunk(&mut self, digest:&[u8; 32]) -> Result<Vec<u8>, Error> {
+ let chunk = self.read_raw_chunk(digest)?;
+
let raw_data = chunk.decode(self.crypt_config.as_ref().map(Arc::as_ref))?;
// fixme: verify digest?
impl ReadChunk for RemoteChunkReader {
- fn read_chunk(&mut self, digest:&[u8; 32]) -> Result<Vec<u8>, Error> {
+ fn read_raw_chunk(&mut self, digest:&[u8; 32]) -> Result<DataBlob, Error> {
let mut chunk_data = Vec::with_capacity(4*1024*1024);
- if let Some(raw_data) = self.cache.get(digest) {
- return Ok(raw_data.to_vec());
- }
-
- let use_cache = self.cache_hint.contains_key(digest);
-
futures::executor::block_on(self.client.download_chunk(&digest, &mut chunk_data))?;
let chunk = DataBlob::from_raw(chunk_data)?;
chunk.verify_crc()?;
- let raw_data = chunk.decode(self.crypt_config.as_ref().map(Arc::as_ref))?;
+ Ok(chunk)
+ }
+
+ fn read_chunk(&mut self, digest:&[u8; 32]) -> Result<Vec<u8>, Error> {
+
+ if let Some(raw_data) = self.cache.get(digest) {
+ return Ok(raw_data.to_vec());
+ }
- // fixme: verify chunk digest
+ let chunk = self.read_raw_chunk(digest)?;
+ let raw_data = chunk.decode(self.crypt_config.as_ref().map(Arc::as_ref))?;
+
+ // fixme: verify digest?
+
+ let use_cache = self.cache_hint.contains_key(digest);
if use_cache {
self.cache.insert(*digest, raw_data.to_vec());
}
Ok(raw_data)
}
+
}