Skip to content

fix(consumer): Fix deadlock when consumer event handling and kafka client polling is scheduled onto the same POSIX thread #32

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
john-z-yang merged 1 commit into from
Nov 18, 2024
Merged

fix(consumer): Fix deadlock when consumer event handling and kafka client polling is scheduled onto the same POSIX thread #32

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ impl Default for Config {
Self {
sentry_dsn: None,
sentry_env: None,
log_level: LogLevel::Info,
log_level: LogLevel::Debug,
Copy link
Contributor Author

@john-z-yang john-z-yang Nov 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Set the default log level to debug here because it seems like this default config is the development config

log_format: LogFormat::Text,
grpc_port: 50051,
statsd_addr: "127.0.0.1:8126".parse().unwrap(),
Expand Down Expand Up @@ -159,7 +159,7 @@ mod tests {
};
assert_eq!(config.sentry_dsn, None);
assert_eq!(config.sentry_env, None);
assert_eq!(config.log_level, LogLevel::Info);
assert_eq!(config.log_level, LogLevel::Debug);
assert_eq!(config.log_format, LogFormat::Text);
assert_eq!(config.grpc_port, 50051);
assert_eq!(config.kafka_topic, "task-worker");
Expand Down
27 changes: 15 additions & 12 deletions src/consumer/kafka.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ use std::{
time::Duration,
};
use tokio::{
runtime::Handle,
select, signal,
sync::{
mpsc::{self, unbounded_channel, UnboundedReceiver, UnboundedSender},
oneshot,
},
task::JoinSet,
task::{self, JoinSet},
time::{self, sleep, MissedTickBehavior},
};
use tokio_stream::wrappers::UnboundedReceiverStream;
Expand Down Expand Up @@ -84,18 +85,20 @@ pub fn handle_consumer_client(
consumer: Arc<StreamConsumer<KafkaContext>>,
shutdown: oneshot::Receiver<()>,
) {
tokio::spawn(async move {
select! {
biased;
_ = shutdown => {
debug!("Received shutdown signal, commiting state in sync mode...");
let _ = consumer.commit_consumer_state(rdkafka::consumer::CommitMode::Sync);
}
msg = consumer.recv() => {
error!("Got unexpected message from consumer client: {:?}", msg);
task::spawn_blocking(|| {
Handle::current().block_on(async move {
select! {
biased;
_ = shutdown => {
debug!("Received shutdown signal, commiting state in sync mode...");
let _ = consumer.commit_consumer_state(rdkafka::consumer::CommitMode::Sync);
}
msg = consumer.recv() => {
error!("Got unexpected message from consumer client: {:?}", msg);
}
}
}
debug!("Shutdown complete");
debug!("Shutdown complete");
});
});
}

Expand Down
Loading