some metrics and logs polishes

Author: alindima

polkadot/node/network/availability-recovery/src/error.rs

@@ -86,6 +86,6 @@ pub fn log_error(result: Result<()>) -> std::result::Result<(), FatalError> {
 impl JfyiError {
 	/// Log a `JfyiError`.
 	pub fn log(self) {
-		gum::warn!(target: LOG_TARGET, error = ?self);
+		gum::warn!(target: LOG_TARGET, "{}", self);
 	}
 }

polkadot/node/network/availability-recovery/src/metrics.rs

@@ -55,6 +55,9 @@ struct MetricsInner {
 	/// - `success`
 	chunk_requests_finished: CounterVec<U64>,
 
+	/// A counter for successful chunk requests, split by the network protocol version.
+	chunk_request_protocols: CounterVec<U64>,
+
 	/// Number of sent available data requests.
 	full_data_requests_issued: Counter<U64>,
 
@@ -202,6 +205,20 @@ impl Metrics {
 		}
 	}
 
+	/// A chunk response was received on the v1 protocol.
+	pub fn on_chunk_response_v1(&self) {
+		if let Some(metrics) = &self.0 {
+			metrics.chunk_request_protocols.with_label_values(&["v1"]).inc()
+		}
+	}
+
+	/// A chunk response was received on the v2 protocol.
+	pub fn on_chunk_response_v2(&self) {
+		if let Some(metrics) = &self.0 {
+			metrics.chunk_request_protocols.with_label_values(&["v2"]).inc()
+		}
+	}
+
 	/// A full data request succeeded.
 	pub fn on_full_request_succeeded(&self) {
 		if let Some(metrics) = &self.0 {
@@ -314,6 +331,16 @@ impl metrics::Metrics for Metrics {
 				)?,
 				registry,
 			)?,
+			chunk_request_protocols: prometheus::register(
+				CounterVec::new(
+					Opts::new(
+						"polkadot_parachain_availability_recovery_chunk_request_protocols",
+						"Total number of successful chunk requests, mapped by the protocol version (v1 or v2).",
+					),
+					&["protocol"],
+				)?,
+				registry,
+			)?,
 			full_data_requests_finished: prometheus::register(
 				CounterVec::new(
 					Opts::new(

polkadot/node/network/availability-recovery/src/task/strategy/mod.rs

@@ -384,21 +384,23 @@ impl State {
 					let res = match res.await {
 						Ok((bytes, protocol)) =>
 							if v2_protocol_name == protocol {
+								params.metrics.on_chunk_response_v2();
 								match req_res::v2::ChunkFetchingResponse::decode(&mut &bytes[..]) {
 									Ok(req_res::v2::ChunkFetchingResponse::Chunk(chunk)) =>
 										Ok(Some(chunk.into())),
 									Ok(req_res::v2::ChunkFetchingResponse::NoSuchChunk) => Ok(None),
 									Err(e) => Err(RequestError::InvalidResponse(e)),
 								}
 							} else if v1_protocol_name == protocol {
+								params.metrics.on_chunk_response_v1();
 								// V1 protocol version must not be used when chunk mapping node
 								// feature is enabled, because we can't know the real index of the
 								// returned chunk.
 								// This case should never be reached as long as the
 								// `AvailabilityChunkMapping` feature is only enabled after the
 								// v1 version is removed. Still, log this.
 								if chunk_mapping_enabled {
-									gum::warn!(
+									gum::info!(
 										target: LOG_TARGET,
 										?candidate_hash,
 										authority_id = ?authority_id_clone,

polkadot/node/subsystem-bench/examples/availability_read.yaml

@@ -1,8 +1,8 @@
 TestConfiguration:
 # Test 1
 - objective: !DataAvailabilityRead
-    fetch_from_backers: true
-  n_validators: 300
+    strategy: FullFromBackers
+  n_validators: 500
   n_cores: 20
   min_pov_size: 5120
   max_pov_size: 5120
@@ -16,7 +16,7 @@ TestConfiguration:
 
 # Test 2
 - objective: !DataAvailabilityRead
-    fetch_from_backers: true
+    strategy: FullFromBackers
   n_validators: 500
   n_cores: 20
   min_pov_size: 5120
@@ -31,7 +31,7 @@ TestConfiguration:
 
 # Test 3
 - objective: !DataAvailabilityRead
-    fetch_from_backers: true
+    strategy: FullFromBackers
   n_validators: 1000
   n_cores: 20
   min_pov_size: 5120