Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(kad): reduce noise of "remote supports our protocol" log #4278

Merged
merged 10 commits into from
Aug 7, 2023
Merged

fix(kad): reduce noise of "remote supports our protocol" log #4278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7ee79d0
kad: Change connection handler logging.
shamil-gadelshin Aug 1, 2023
a0fcc67
kad: Update change log for reducing log noise.
shamil-gadelshin Aug 1, 2023
97a882a
feat(swarm): Implement Display for ConnectionId
shamil-gadelshin Aug 2, 2023
65a0610
fix(kad): Update handler logging.
shamil-gadelshin Aug 2, 2023
608bf81
feat(swarm): bump swarm version to 0.43.3
shamil-gadelshin Aug 3, 2023
4086247
Update swarm/CHANGELOG.md
thomaseizinger Aug 3, 2023
108c155
fix: update Cargo.lock
shamil-gadelshin Aug 7, 2023
1ea7b86
fix: update Cargo.toml
shamil-gadelshin Aug 7, 2023
f5c8a6e
Merge branch 'master' into kad-change-handler-logging
thomaseizinger Aug 7, 2023
83bf513
Merge branch 'master' into kad-change-handler-logging
mergify[bot] Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions protocols/kad/src/behaviour.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,7 @@ where
connected_point,
peer,
self.mode,
connection_id,
))
}

Expand All @@ -2103,6 +2104,7 @@ where
connected_point,
peer,
self.mode,
connection_id,
))
}

Expand Down
21 changes: 14 additions & 7 deletions protocols/kad/src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use libp2p_swarm::handler::{
ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
};
use libp2p_swarm::{
ConnectionHandler, ConnectionHandlerEvent, KeepAlive, Stream, StreamUpgradeError,
ConnectionHandler, ConnectionHandlerEvent, ConnectionId, KeepAlive, Stream, StreamUpgradeError,
SubstreamProtocol, SupportedProtocols,
};
use log::trace;
Expand Down Expand Up @@ -94,6 +94,9 @@ pub struct KademliaHandler {
protocol_status: ProtocolStatus,

remote_supported_protocols: SupportedProtocols,

/// The current connection ID from the behaviour.
thomaseizinger marked this conversation as resolved.
Show resolved Hide resolved
connection_id: ConnectionId,
}

/// The states of protocol confirmation that a connection
Expand Down Expand Up @@ -474,6 +477,7 @@ impl KademliaHandler {
endpoint: ConnectedPoint,
remote_peer_id: PeerId,
mode: Mode,
connection_id: ConnectionId,
) -> Self {
match &endpoint {
ConnectedPoint::Dialer { .. } => {
Expand Down Expand Up @@ -504,6 +508,7 @@ impl KademliaHandler {
keep_alive,
protocol_status: ProtocolStatus::Unknown,
remote_supported_protocols: Default::default(),
connection_id,
}
}

Expand Down Expand Up @@ -803,17 +808,19 @@ impl ConnectionHandler for KademliaHandler {
match (remote_supports_our_kademlia_protocols, self.protocol_status) {
(true, ProtocolStatus::Confirmed | ProtocolStatus::Reported) => {}
(true, _) => {
log::info!(
"Remote {} now supports our kademlia protocol",
self.remote_peer_id
log::debug!(
"Remote {} now supports our kademlia protocol. {:?}",
thomaseizinger marked this conversation as resolved.
Show resolved Hide resolved
self.remote_peer_id,
self.connection_id,
);

self.protocol_status = ProtocolStatus::Confirmed;
}
(false, ProtocolStatus::Confirmed | ProtocolStatus::Reported) => {
log::info!(
"Remote {} no longer supports our kademlia protocol",
self.remote_peer_id
log::debug!(
"Remote {} no longer supports our kademlia protocol. {:?}",
self.remote_peer_id,
self.connection_id,
);

self.protocol_status = ProtocolStatus::NotSupported;
Expand Down