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

Jump to bottom

dekaf: apply a 30 second idle session timeout #1700

Merged
merged 1 commit into from
Oct 15, 2024
Merged

dekaf: apply a 30 second idle session timeout #1700

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
56 changes: 30 additions & 26 deletions crates/dekaf/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use std::{
path::{Path, PathBuf},
sync::Arc,
};
use tokio::io::{split, AsyncRead, AsyncWrite, AsyncWriteExt};
use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
use tracing_subscriber::{filter::LevelFilter, EnvFilter};
use url::Url;

Expand Down Expand Up @@ -261,41 +261,43 @@ where
S: AsyncRead + AsyncWrite + Unpin,
{
tracing::info!("accepted client connection");

let (r, mut w) = tokio::io::split(socket);
let mut r = tokio_util::codec::FramedRead::new(
r,
tokio_util::codec::LengthDelimitedCodec::builder()
.big_endian()
.length_field_length(4)
.max_frame_length(1 << 27) // 128 MiB
.new_codec(),
);
let mut out = bytes::BytesMut::new();
let mut raw_sasl_auth = false;

metrics::gauge!("dekaf_total_connections").increment(1);

let result = async {
let (r, mut w) = split(socket);

let mut r = tokio_util::codec::FramedRead::new(
r,
tokio_util::codec::LengthDelimitedCodec::builder()
.big_endian()
.length_field_length(4)
.max_frame_length(1 << 27) // 128 MiB
.new_codec(),
);

let mut out = bytes::BytesMut::new();
let mut raw_sasl_auth = false;
let mut res = Ok(());
while let Some(frame) = r.try_next().await? {
if let err @ Err(_) =
dekaf::dispatch_request_frame(&mut session, &mut raw_sasl_auth, frame, &mut out)
.await
{
// Close the connection on error
w.shutdown().await?;
res = err;
}
loop {
let Some(frame) = tokio::time::timeout(SESSION_TIMEOUT, r.try_next())
.await
.context("timeout waiting for next session request")?
.context("failed to read next session request")?
else {
return Ok(());
};

dekaf::dispatch_request_frame(&mut session, &mut raw_sasl_auth, frame, &mut out)
.await?;

() = w.write_all(&mut out).await?;
out.clear();
}

res
}
.await;

metrics::gauge!("dekaf_total_connections").decrement(1);

w.shutdown().await?;
Copy link
Contributor

Choose a reason for hiding this comment

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

What's your thinking on doing this after vs before decrementing the gauge? This way the gauge gets decremented even if there's an error shutting down the socket, which... probably still results in a closed socket in the end, so makes the gauge more accurate?

result
}

Expand Down Expand Up @@ -334,3 +336,5 @@ fn validate_certificate_name(
}
return Ok(false);
}

const SESSION_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
Loading