-
Notifications
You must be signed in to change notification settings - Fork 961
Remove pending requests from ready_requests #6625
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.
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
base: unstable
Are you sure you want to change the base?
Remove pending requests from ready_requests #6625
Conversation
jxs
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice find Akihito! submitted #6634 to ease it
We don't need to store `BehaviourAction` for `ready_requests` and therefore avoid having an `unreachable!` on #6625. Therefore this PR should be merged before it
We don't need to store `BehaviourAction` for `ready_requests` and therefore avoid having an `unreachable!` on sigp#6625. Therefore this PR should be merged before it
We don't need to store `BehaviourAction` for `ready_requests` and therefore avoid having an `unreachable!` on sigp#6625. Therefore this PR should be merged before it
|
This pull request has merge conflicts. Could you please resolve them @ackintosh? 🙏 |
|
Hi @ackintosh, this pull request has been closed automatically due to 30 days of inactivity. If you’d like to continue working on it, feel free to reopen at any time. |
# Conflicts: # beacon_node/lighthouse_network/src/rpc/self_limiter.rs
# Conflicts: # beacon_node/lighthouse_network/src/rpc/self_limiter.rs
| true | ||
| } | ||
| } else { | ||
| unreachable!("Coding error: unexpected RPCSend variant {rpc_send:?}.") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it necessary to have this unreachable here? What about a debug assert?
| } | ||
|
|
||
| // Wait until the tokens have been regenerated, then run `next_peer_request_ready`. | ||
| tokio::time::sleep(Duration::from_secs(3)).await; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you set a custom quota so we don't have to wait 3 seconds here?
|
Hi @ackintosh, this pull request has been closed automatically due to 30 days of inactivity. If you’d like to continue working on it, feel free to reopen at any time. |
Issue Addressed & Proposed Changes
The pending requests in
delay_requestsmove toready_requestsbefore being returned bypoll_ready. One request is returned perpoll_readycall, so some pending requests might remain inready_requests. We need to remove the pending requests fromready_requests, just likedelay_requests, when a peer disconnects.