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

Stuck lookup v6 #6658

Merged
merged 2 commits into from
Dec 13, 2024
+4 −1
Merged

Stuck lookup v6 #6658

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193c7f8
Fix stuck lookups if no peers on v6
dapplion Dec 5, 2024
9d82a1d
Merge branch 'release-v6.0.1' into stuck-lookup-v6
michaelsproul Dec 13, 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
5 changes: 4 additions & 1 deletion beacon_node/network/src/sync/block_lookups/single_block_lookup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ impl<T: BeaconChainTypes> SingleBlockLookup<T> {
self.awaiting_parent.is_some()
|| self.block_request_state.state.is_awaiting_event()
|| match &self.component_requests {
ComponentRequests::WaitingForBlock => true,
// If components are waiting for the block request to complete, here we should
// check if the`block_request_state.state.is_awaiting_event(). However we already
// checked that above, so `WaitingForBlock => false` is equivalent.
ComponentRequests::WaitingForBlock => false,
Copy link
Member

@jimmygchen jimmygchen Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this makes sense.

I wonder if this would drop any lookups that are awaiting processing?

lighthouse/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs

Line 500 in 886d409

State::AwaitingProcess { .. } => false,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unlikely an issue - if we do need the block, external events should somehow keep this lookup in place, a single disconnected peer should not affect this.

ComponentRequests::ActiveBlobRequest(request, _) => {
request.state.is_awaiting_event()
}
Expand Down
Loading