From 70231d68b27054c2185b73b5ceee1c445baaaa2d Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 31 Aug 2022 19:44:27 +0200
Subject: [PATCH] Fix bytes_read counter

---
 src/block/manager.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/block/manager.rs b/src/block/manager.rs
index 80c52510..b8fe4c74 100644
--- a/src/block/manager.rs
+++ b/src/block/manager.rs
@@ -449,8 +449,6 @@ impl BlockManager {
 
 		let (header, data) = block.into_parts();
 
-		self.metrics.bytes_read.add(data.len() as u64);
-
 		Resp::new(Ok(BlockRpc::PutBlock {
 			hash: *hash,
 			header,
@@ -460,9 +458,16 @@ impl BlockManager {
 
 	/// Read block from disk, verifying it's integrity
 	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)
-			.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> {