Skip to content

fix(collector): acknowledge buffered proof rotations #366

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

Merged
proerror77 merged 2 commits into from
Jul 26, 2026
Merged

fix(collector): acknowledge buffered proof rotations #366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
988a0e1
fix(collector): acknowledge buffered proof rotations
Jul 26, 2026
acebaee
fix(collector): abandon buffered proof across rotation
Jul 26, 2026
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
78 changes: 36 additions & 42 deletions rust_hft/tools/collector/src/bin/binance-lob-archiver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,22 +2008,26 @@ async fn receive_url(
}
},
ProducerWait::PauseRequested => {
if proof_events.is_empty() {
if let Some(exit) = acknowledge_rotation_pause(
producer_id,
&sender,
&mut rotation_pause,
&mut rotation_resume,
&mut last_pause_epoch,
&mut shutdown,
)
.await?
{
return Ok(exit);
}
subscription_proof_deadline =
tokio::time::Instant::now() + subscription_proof_timeout;
let buffered_proof_interrupted = !proof_events.is_empty();
if let Some(exit) = acknowledge_rotation_pause(
producer_id,
&sender,
&mut rotation_pause,
&mut rotation_resume,
Comment thread
proerror77 marked this conversation as resolved.
&mut last_pause_epoch,
&mut shutdown,
)
.await?
{
return Ok(exit);
}
if buffered_proof_interrupted {
proof_failure =
Some("segment rotation interrupted buffered subscription proof".into());
break;
}
subscription_proof_deadline =
tokio::time::Instant::now() + subscription_proof_timeout;
continue;
}
ProducerWait::Stopped => {
Expand Down Expand Up @@ -4179,7 +4183,7 @@ mod tests {
}

#[tokio::test]
async fn buffered_reconnect_proof_event_drains_before_rotation_barrier() {
async fn buffered_reconnect_proof_event_is_abandoned_after_rotation() {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let address = listener.local_addr().unwrap();
let event_time_ms = now_ns().unwrap() / 1_000_000;
Expand Down Expand Up @@ -4277,29 +4281,23 @@ mod tests {
market_frame_rx.await.unwrap();
tokio::time::sleep(Duration::from_millis(50)).await;
pause_tx.send(1).unwrap();
assert!(
tokio::time::timeout(Duration::from_millis(100), receiver.recv())
.await
.is_err(),
"rotation barrier acknowledged before the buffered proof event was verified"
);
proof_tx.send(()).unwrap();
assert!(matches!(
receiver.recv().await,
Some(Event::StreamReconnected { .. })
));
assert!(matches!(
receiver.recv().await,
Some(Event::AggregateTrade { .. })
));
assert!(matches!(
receiver.recv().await,
tokio::time::timeout(Duration::from_secs(1), receiver.recv())
.await
.unwrap(),
Some(Event::RotationBarrier {
producer_id: 0,
epoch: 1
})
));
resume_tx.send(1).unwrap();
proof_tx.send(()).unwrap();
assert!(matches!(
tokio::time::timeout(Duration::from_secs(1), receiver.recv())
.await
.unwrap(),
Some(Event::StreamDisconnected { .. })
));
shutdown_tx.send(true).unwrap();
assert!(matches!(
task.await.unwrap().unwrap(),
Expand Down Expand Up @@ -4397,26 +4395,22 @@ mod tests {
market_frame_rx.await.unwrap();
tokio::time::sleep(Duration::from_millis(100)).await;
pause_tx.send(1).unwrap();
assert!(
tokio::time::timeout(Duration::from_millis(100), receiver.recv())
.await
.is_err(),
"rotation barrier acknowledged before the buffered proof event timed out"
);
assert!(matches!(
tokio::time::timeout(Duration::from_secs(1), receiver.recv())
.await
.unwrap(),
Some(Event::StreamDisconnected { .. })
));
assert!(matches!(
receiver.recv().await,
Some(Event::RotationBarrier {
producer_id: 0,
epoch: 1
})
));
resume_tx.send(1).unwrap();
assert!(matches!(
tokio::time::timeout(Duration::from_secs(1), receiver.recv())
.await
.unwrap(),
Some(Event::StreamDisconnected { .. })
));
shutdown_tx.send(true).unwrap();
assert!(matches!(
task.await.unwrap().unwrap(),
Expand Down
Loading