From 9ea6d4dffb3dec1e15761baf712e6a789434a6ba Mon Sep 17 00:00:00 2001 From: Alex Pyattaev Date: Thu, 6 Feb 2025 22:01:04 +0000 Subject: [PATCH] disable in-packet parallel processing --- gossip/src/cluster_info.rs | 2 +- gossip/src/protocol.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gossip/src/cluster_info.rs b/gossip/src/cluster_info.rs index 8d7d201bea44e2..3d57aa10b904b9 100644 --- a/gossip/src/cluster_info.rs +++ b/gossip/src/cluster_info.rs @@ -2294,7 +2294,7 @@ impl ClusterInfo { return None; } } - protocol.par_verify().then(|| { + protocol.verify().then(|| { stats.packets_received_verified_count.add_relaxed(1); (packet.meta().socket_addr(), protocol) }) diff --git a/gossip/src/protocol.rs b/gossip/src/protocol.rs index 2b46d45e4799df..9929cc2813db45 100644 --- a/gossip/src/protocol.rs +++ b/gossip/src/protocol.rs @@ -7,7 +7,6 @@ use { ping_pong::{self, Pong}, }, bincode::serialize, - rayon::prelude::*, serde::Serialize, solana_perf::packet::PACKET_DATA_SIZE, solana_sanitize::{Sanitize, SanitizeError}, @@ -92,11 +91,11 @@ impl Protocol { // Returns true if all signatures verify. #[must_use] - pub(crate) fn par_verify(&self) -> bool { + pub(crate) fn verify(&self) -> bool { match self { Self::PullRequest(_, caller) => caller.verify(), - Self::PullResponse(_, data) => data.par_iter().all(CrdsValue::verify), - Self::PushMessage(_, data) => data.par_iter().all(CrdsValue::verify), + Self::PullResponse(_, data) => data.iter().all(CrdsValue::verify), + Self::PushMessage(_, data) => data.iter().all(CrdsValue::verify), Self::PruneMessage(_, data) => data.verify(), Self::PingMessage(ping) => ping.verify(), Self::PongMessage(pong) => pong.verify(),