gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-20 05:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect waker update condition (#7656)

Browse Source 
This bug was first found and partially fixed by @VolodymyrBg in #7317 - this PR applies the same fix everywhere else.

The old logic updated the waker when it already matched the context, and did nothing when it was stale:

```rust
if waker.will_wake(cx.waker()) {
self.waker = Some(cx.waker().clone());
}
```

This is the wrong way around. We only want to update the waker if it doesn't match the current context:

```rust
if !waker.will_wake(cx.waker()) {
self.waker = Some(cx.waker().clone());
}
```

I don't think we've ever noticed any issues, but it’s a subtle bug that could lead to missed wakeups.
This commit is contained in:
Jimmy Chen
2025-06-28 05:01:46 +10:00
committed by GitHub
parent 83cad25d98
commit 522e00f48d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/lighthouse_network/src/rpc/handler.rs
View File

@@ -377,7 +377,7 @@ where
ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>, ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>,
> { > {
if let Some(waker) = &self.waker { if let Some(waker) = &self.waker {
if waker.will_wake(cx.waker()) { if !waker.will_wake(cx.waker()) {
self.waker = Some(cx.waker().clone()); self.waker = Some(cx.waker().clone());
} }
} else { } else {

2
beacon_node/network/src/subnet_service/attestation_subnets.rs
View File

@@ -600,7 +600,7 @@ impl<T: BeaconChainTypes> Stream for AttestationService<T> {
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
// Update the waker if needed. // Update the waker if needed.
if let Some(waker) = &self.waker { if let Some(waker) = &self.waker {
if waker.will_wake(cx.waker()) { if !waker.will_wake(cx.waker()) {
self.waker = Some(cx.waker().clone()); self.waker = Some(cx.waker().clone());
} }
} else { } else {

2
beacon_node/network/src/subnet_service/mod.rs
View File

@@ -663,7 +663,7 @@ impl<T: BeaconChainTypes> Stream for SubnetService<T> {
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
// Update the waker if needed. // Update the waker if needed.
if let Some(waker) = &self.waker { if let Some(waker) = &self.waker {
if waker.will_wake(cx.waker()) { if !waker.will_wake(cx.waker()) {
self.waker = Some(cx.waker().clone()); self.waker = Some(cx.waker().clone());
} }
} else { } else {

2
beacon_node/network/src/subnet_service/sync_subnets.rs
View File

@@ -319,7 +319,7 @@ impl<T: BeaconChainTypes> Stream for SyncCommitteeService<T> {
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
// update the waker if needed // update the waker if needed
if let Some(waker) = &self.waker { if let Some(waker) = &self.waker {
if waker.will_wake(cx.waker()) { if !waker.will_wake(cx.waker()) {
self.waker = Some(cx.waker().clone()); self.waker = Some(cx.waker().clone());
} }
} else { } else {