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

SyncQueue: fix manipulation of next_outgoing_index on error path #2541

Merged
merged 1 commit into from
Jun 3, 2024
Merged

SyncQueue: fix manipulation of next_outgoing_index on error path #2541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 38 additions & 16 deletions consensus/src/sync/sync_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub struct SyncQueue<
ids_to_request: VecDeque<(TId, Option<TNetwork::PubsubId>)>,
pending_futures:
FuturesUnordered<OrderWrapper<TId, BoxFuture<'static, Option<Result<TOutput, TError>>>>>,
queued_outputs: BinaryHeap<OrderWrapper<TId, TOutput>>,
queued_outputs: BinaryHeap<OrderWrapper<TId, Option<TOutput>>>,
next_incoming_index: usize,
next_outgoing_index: usize,
current_peer_index: PeerListIndex,
Expand Down Expand Up @@ -369,19 +369,29 @@ where
if let Some(next_output) = self.queued_outputs.peek() {
if next_output.index == self.next_outgoing_index {
let request = self.queued_outputs.pop().unwrap();
if (self.verify_fn)(&request.id, &request.data, &mut self.verify_state) {
self.next_outgoing_index += 1;
return Poll::Ready(Some(Ok(request.data)));
} else {
debug!(peer_id = %request.peer, id = ?request.id, "Verification failed");
let id = request.id.clone();
if !self.retry_request(
request.id,
request.index,
request.peer,
request.num_tries,
) {
return Poll::Ready(Some(Err(id)));

match request.data {
Some(data) => {
if (self.verify_fn)(&request.id, &data, &mut self.verify_state) {
self.next_outgoing_index += 1;
return Poll::Ready(Some(Ok(data)));
} else {
debug!(peer_id = %request.peer, id = ?request.id, "Verification failed");
let id = request.id.clone();
if !self.retry_request(
request.id,
request.index,
request.peer,
request.num_tries,
) {
self.next_outgoing_index += 1;
return Poll::Ready(Some(Err(id)));
}
}
}
None => {
self.next_outgoing_index += 1;
return Poll::Ready(Some(Err(request.id)));
}
}
}
Expand All @@ -402,7 +412,7 @@ where
} else {
self.queued_outputs.push(OrderWrapper {
id: result.id,
data: output,
data: Some(output),
index: result.index,
peer: result.peer,
num_tries: result.num_tries,
Expand All @@ -420,8 +430,20 @@ where

// The request or verification failed.
let id = result.id.clone();
let peer = result.peer.clone();
if !self.retry_request(result.id, result.index, result.peer, result.num_tries) {
return Poll::Ready(Some(Err(id)));
if result.index == self.next_outgoing_index {
self.next_outgoing_index += 1;
return Poll::Ready(Some(Err(id)));
} else {
self.queued_outputs.push(OrderWrapper {
id,
data: None,
index: result.index,
peer,
num_tries: result.num_tries,
});
}
}
}
None => {
Expand Down
Loading