From 5a8999ade29ad54e72caf85115c424361caaf379 Mon Sep 17 00:00:00 2001 From: zeroqn Date: Thu, 10 Sep 2020 22:58:58 +0800 Subject: [PATCH] fix(metric): network broadcast all data size (#452) --- core/network/src/peer_manager/shared.rs | 4 ++++ core/network/src/protocols/transmitter/behaviour.rs | 5 +---- core/network/src/traits.rs | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/network/src/peer_manager/shared.rs b/core/network/src/peer_manager/shared.rs index 96d371dc2..080268c97 100644 --- a/core/network/src/peer_manager/shared.rs +++ b/core/network/src/peer_manager/shared.rs @@ -122,6 +122,10 @@ impl SharedSessionBook for SharedSessions { .collect() }) } + + fn len(&self) -> usize { + self.sessions().len() + } } #[cfg(test)] diff --git a/core/network/src/protocols/transmitter/behaviour.rs b/core/network/src/protocols/transmitter/behaviour.rs index a1500e218..2bdfc31f3 100644 --- a/core/network/src/protocols/transmitter/behaviour.rs +++ b/core/network/src/protocols/transmitter/behaviour.rs @@ -191,10 +191,7 @@ impl<'a> SendingContext<'a> { let data_size = match &target { TargetSession::Single(_) => data.len(), TargetSession::Multi(sessions) => data.len().saturating_mul(sessions.len()), - _ => { - log::warn!("filter blocked return target other than single and multi"); - data.len() - } + TargetSession::All => data.len().saturating_mul(self.sessions.len()), }; common_apm::metrics::network::NETWORK_MESSAGE_SIZE_COUNT_VEC .with_label_values(&["send", url]) diff --git a/core/network/src/traits.rs b/core/network/src/traits.rs index ef47f9af3..f2dbb23ef 100644 --- a/core/network/src/traits.rs +++ b/core/network/src/traits.rs @@ -50,6 +50,7 @@ pub trait SharedSessionBook { fn connected_addr(&self, sid: SessionId) -> Option; fn pending_data_size(&self, sid: SessionId) -> usize; fn allowlist(&self) -> Vec; + fn len(&self) -> usize; } pub trait MultiaddrExt {