Remove pending requests from ready_requests#6625
Remove pending requests from ready_requests#6625mergify[bot] merged 17 commits intosigp:unstablefrom
Conversation
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.
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.
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. |
dapplion
left a comment
There was a problem hiding this comment.
Looks good to me! The test is solid too
Merge Queue StatusRule:
This pull request spent 30 minutes 58 seconds in the queue, including 29 minutes 3 seconds running CI. Required conditions to merge
|
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.