Skip to content

merge queue: embarking unstable (4e675cf) and [#6336 + #6342] together #6351

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

Closed
mergify wants to merge 4 commits into from
Closed

merge queue: embarking unstable (4e675cf) and [#6336 + #6342] together #6351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eafc106
Send metadata request ordering
pawanjay176 Aug 30, 2024
9e31c54
Clarify validator monitor block log
michaelsproul Sep 3, 2024
d5782ad
Merge of #6336
mergify[bot] Sep 4, 2024
9000f11
Merge of #6342
mergify[bot] Sep 4, 2024
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: 1 addition & 1 deletion beacon_node/beacon_chain/src/validator_monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ impl<E: EthSpec> ValidatorMonitor<E> {

info!(
self.log,
"Block from API";
"Block from monitored validator";
"root" => ?block_root,
"delay" => %delay.as_millis(),
"slot" => %block.slot(),
Expand Down
8 changes: 4 additions & 4 deletions beacon_node/lighthouse_network/src/peer_manager/network_behaviour.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@ impl<E: EthSpec> PeerManager<E> {
"connection" => ?endpoint.to_endpoint()
);

if other_established == 0 {
self.events.push(PeerManagerEvent::MetaData(peer_id));
}

// Update the prometheus metrics
if self.metrics_enabled {
metrics::inc_counter(&metrics::PEER_CONNECT_EVENT_COUNT);
Expand All @@ -267,6 +263,10 @@ impl<E: EthSpec> PeerManager<E> {
return;
}

if other_established == 0 {
self.events.push(PeerManagerEvent::MetaData(peer_id));
}

// NOTE: We don't register peers that we are disconnecting immediately. The network service
// does not need to know about these peers.
match endpoint {
Expand Down