Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

use netapp streaming body #343

Merged
lx merged 31 commits from netapp-stream-body into main 2022-09-13 13:26:09 +00:00
Conversation 1 Commits 31 Files changed 24 +9 -4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 70231d68b2 - Show all commits

13
src/block/manager.rs
View file

@ -449,8 +449,6 @@ impl BlockManager {
let (header, data) = block.into_parts(); let (header, data) = block.into_parts();
self.metrics.bytes_read.add(data.len() as u64);
Resp::new(Ok(BlockRpc::PutBlock { Resp::new(Ok(BlockRpc::PutBlock {
hash: *hash, hash: *hash,
header, header,
@ -460,9 +458,16 @@ impl BlockManager {
/// Read block from disk, verifying it's integrity /// Read block from disk, verifying it's integrity
pub(crate) async fn read_block(&self, hash: &Hash) -> Result<DataBlock, Error> { pub(crate) async fn read_block(&self, hash: &Hash) -> Result<DataBlock, Error> {
self.read_block_internal(hash) let data = self
.read_block_internal(hash)
.bound_record_duration(&self.metrics.block_read_duration) .bound_record_duration(&self.metrics.block_read_duration)
.await .await?;
self.metrics
.bytes_read
.add(data.inner_buffer().len() as u64);
Ok(data)
} }
async fn read_block_internal(&self, hash: &Hash) -> Result<DataBlock, Error> { async fn read_block_internal(&self, hash: &Hash) -> Result<DataBlock, Error> {