Skip to content

Fix lost Kafka catch-up signal that can hang Thunder startup #47

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

Open
huxint wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −21
Open

Fix lost Kafka catch-up signal that can hang Thunder startup #47

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
47 changes: 26 additions & 21 deletions thunder/kafka/tweet_events_listener_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,28 +198,33 @@ async fn process_tweet_events_v2(

message_buffer.extend(messages);

if message_buffer.len() >= batch_size {
batch_count += 1;
let messages = std::mem::take(&mut message_buffer);
let post_store_clone = Arc::clone(&post_store);

let permit = if init_data_downloaded {
Some(semaphore.clone().acquire_owned().await.unwrap())
} else {
None
};

let _ = tokio::task::spawn_blocking(move || {
let _permit = permit;
match deserialize_batch(messages) {
Err(e) => warn!("Error processing batch {}: {:#}", batch_count, e),
Ok((light_posts, delete_posts)) => {
post_store_clone.insert_posts(light_posts);
post_store_clone.mark_as_deleted(delete_posts);
}
// catchup_sender is Some only on the single iteration where catch-up
// is detected, so flush and signal even if a full batch has not
// accumulated; otherwise the signal is lost and startup blocks forever.
if message_buffer.len() >= batch_size || catchup_sender.is_some() {
if !message_buffer.is_empty() {
batch_count += 1;
let messages = std::mem::take(&mut message_buffer);
let post_store_clone = Arc::clone(&post_store);

let permit = if init_data_downloaded {
Some(semaphore.clone().acquire_owned().await.unwrap())
} else {
None
};
})
.await;

let _ = tokio::task::spawn_blocking(move || {
let _permit = permit;
match deserialize_batch(messages) {
Err(e) => warn!("Error processing batch {}: {:#}", batch_count, e),
Ok((light_posts, delete_posts)) => {
post_store_clone.insert_posts(light_posts);
post_store_clone.mark_as_deleted(delete_posts);
}
};
})
.await;
}

if let Some((sender, lag)) = catchup_sender {
info!("Completed kafka init for a single thread");
Expand Down