refactor(l1): multiplex p2p requests #4797
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lines of code reportTotal lines added: Detailed view |
mpaulucci
reviewed
Oct 9, 2025
| ) -> Result<Message, PeerConnectionError> { | ||
| let id = message | ||
| .request_id() | ||
| .expect("Cannot wait on request without id"); |
Collaborator
There was a problem hiding this comment.
do we really want to panic here?
Contributor
Author
There was a problem hiding this comment.
Sending a request (to expect a response) using a message that does not have request id is a bug... (the task will wait a response that will never come)
I'd prefer a compile error here, to prevent the dev to introduce the bug, but since we can't with our current types, lets panic
mpaulucci
reviewed
Oct 9, 2025
| Message::AccountRange(message) => Some(message.id), | ||
| Message::StorageRanges(message) => Some(message.id), | ||
| Message::ByteCodes(message) => Some(message.id), | ||
| Message::TrieNodes(message) => Some(message.id), |
Collaborator
There was a problem hiding this comment.
nit: cant you use | like you do below?
Contributor
Author
There was a problem hiding this comment.
How's that? message on each matching clause has a different type 🤔
mpaulucci
approved these changes
Oct 9, 2025
Oppen
reviewed
Oct 10, 2025
Comment on lines
+169
to
175
| /// Increment the number of ongoing requests for this peer | ||
| pub async fn inc_requests(&mut self, node_id: H256) -> Result<(), PeerTableError> { | ||
| self.handle | ||
| .cast(CastMessage::IncRequests { node_id }) | ||
| .await?; | ||
| Ok(()) | ||
| } |
Contributor
There was a problem hiding this comment.
Shouldn't this be managed by peer itself?
Contributor
Author
There was a problem hiding this comment.
The number of requests is used for the math to balance the load between all peers, when choosing one peer to use. If this number was on peer's processes, it would mean that the get_best_peer function would have to message every active peer before selecting one.
Oppen
reviewed
Oct 10, 2025
| rlpx::{Message, connection::server::CastMessage, snap::TrieNodes}, | ||
| }; | ||
| #[cfg(feature = "rocksdb")] | ||
| use tracing::error; |
Contributor
There was a problem hiding this comment.
Why is this gated with rocksdb?
Contributor
Author
There was a problem hiding this comment.
To be honest: I don't know. It came from a merge from main commit, but it is not in the original commit 🤷♂️
Contributor
Author
There was a problem hiding this comment.
Fixed, if removed it was warning on:
--> crates/networking/p2p/utils.rs:9:5
|
9 | use tracing::error;
| ^^^^^^^^^^^^^^
|
= note: `-D unused-imports` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(unused_imports)]`
But lucky for me there was an unguarded use of tracing::error!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Currently our Peer Connections can handle only one request at a time. We want to be able to handle multiple requests and be able to redirect their responses to proper actors.
Description
Improve request/response handling on peer connections:
Done:
PeerConnectionstructs and enums private exposing only necessary apilock()fromPeerHandlercode and replaced by a oneshot channelPeerConnectionside.mark_in_useandfreelogic that won't be required.To do:
PeerConnectionin a balanced fashionCloses #3963