Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

[Do not merge] Debug logs for collator protocol #5889

Closed
slumber wants to merge 3 commits into from
Closed

[Do not merge] Debug logs for collator protocol #5889

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea06bfe
logging
slumber Aug 16, 2022
01eb21e
trigger build
slumber Aug 16, 2022
452807b
log level
slumber Aug 16, 2022
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
36 changes: 25 additions & 11 deletions node/network/collator-protocol/src/validator_side/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,16 +647,15 @@ async fn fetch_collation(

let PendingCollation { relay_parent, para_id, peer_id, .. } = pc;

let timeout = |collator_id, relay_parent| async move {
Delay::new(MAX_UNSHARED_DOWNLOAD_TIME).await;
(collator_id, relay_parent)
};
state
.collation_fetch_timeouts
.push(timeout(id.clone(), relay_parent.clone()).boxed());

if let Some(peer_data) = state.peer_data.get(&peer_id) {
if peer_data.has_advertised(&relay_parent) {
let timeout = |collator_id, relay_parent| async move {
Delay::new(MAX_UNSHARED_DOWNLOAD_TIME).await;
(collator_id, relay_parent)
};
state
.collation_fetch_timeouts
.push(timeout(id.clone(), relay_parent.clone()).boxed());
request_collation(sender, state, relay_parent, para_id, peer_id, tx).await;
} else {
gum::debug!(
Expand Down Expand Up @@ -932,7 +931,7 @@ async fn process_incoming_peer_message<Context>(

match collations.status {
CollationStatus::Fetching | CollationStatus::WaitingOnValidation => {
gum::trace!(
gum::debug!(
target: LOG_TARGET,
peer_id = ?origin,
%para_id,
Expand Down Expand Up @@ -1062,11 +1061,26 @@ async fn handle_network_msg<Context>(

match bridge_message {
PeerConnected(peer_id, _role, _version, _) => {
gum::debug!(target: LOG_TARGET, ?peer_id, "Peer connected");
state.peer_data.entry(peer_id).or_default();
state.metrics.note_collator_peer_count(state.peer_data.len());
},
PeerDisconnected(peer_id) => {
state.peer_data.remove(&peer_id);
if let Some(peer_data) = state.peer_data.remove(&peer_id) {
match peer_data.state {
PeerState::Collating(state) => gum::debug!(
target: LOG_TARGET,
?peer_id,
"Peer disconnected while being declared, para_id = {}",
state.para_id
),
PeerState::Connected(_) => gum::debug!(
target: LOG_TARGET,
?peer_id,
"Peer disconnected without declaring",
),
}
}
state.metrics.note_collator_peer_count(state.peer_data.len());
},
NewGossipTopology { .. } => {
Expand Down Expand Up @@ -1380,7 +1394,7 @@ async fn disconnect_inactive_peers(
) {
for (peer, peer_data) in peers {
if peer_data.is_inactive(&eviction_policy) {
gum::trace!(target: LOG_TARGET, "Disconnecting inactive peer");
gum::warn!(target: LOG_TARGET, "Disconnecting inactive peer");
disconnect_peer(sender, peer.clone()).await;
}
}
Expand Down