diff --git a/node/network/collator-protocol/src/validator_side/mod.rs b/node/network/collator-protocol/src/validator_side/mod.rs index 997ad62a9804..bcf7da1f4ea4 100644 --- a/node/network/collator-protocol/src/validator_side/mod.rs +++ b/node/network/collator-protocol/src/validator_side/mod.rs @@ -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!( @@ -932,7 +931,7 @@ async fn process_incoming_peer_message( match collations.status { CollationStatus::Fetching | CollationStatus::WaitingOnValidation => { - gum::trace!( + gum::debug!( target: LOG_TARGET, peer_id = ?origin, %para_id, @@ -1062,11 +1061,26 @@ async fn handle_network_msg( 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 { .. } => { @@ -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; } }