Skip to content

fix(gateway-interceptors): configure connect timeout and HTTP/2 keepalive on interceptor gRPC channel #2618

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
letv1nnn wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −5
Open

fix(gateway-interceptors): configure connect timeout and HTTP/2 keepalive on interceptor gRPC channel #2618

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
26 changes: 21 additions & 5 deletions crates/openshell-gateway-interceptors/src/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ use crate::profile_source::GatewayInterceptorProfileSource;
use crate::routes::OpenShellRouteIndex;
use crate::{InterceptorError, Result};

const CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
const HTTP2_KEEP_ALIVE_INTERVAL: Duration = Duration::from_secs(10);
const KEEP_ALIVE_TIMEOUT: Duration = Duration::from_secs(20);

pub const DEFAULT_TIMEOUT: Duration = Duration::from_millis(500);
pub const DEFAULT_MAX_RESPONSE_BYTES: usize = 1_048_576;
pub const DEFAULT_MAX_PATCHES: usize = 32;
Expand Down Expand Up @@ -857,15 +861,27 @@ pub fn parse_duration(value: &str) -> Result<Duration> {
)))
}

/// Repo-standard channel tuning (matches `openshell-core` / `openshell-sdk`):
/// bounded dial + HTTP/2 keepalive so idle interceptor channels survive
/// intermediary idle timeouts and dead peers are detected proactively.
fn tune_endpoint(endpoint: Endpoint) -> Endpoint {
endpoint
.connect_timeout(CONNECT_TIMEOUT)
.http2_keep_alive_interval(HTTP2_KEEP_ALIVE_INTERVAL)
.keep_alive_while_idle(true)
.keep_alive_timeout(KEEP_ALIVE_TIMEOUT)
.http2_adaptive_window(true)
}

async fn connect_endpoint(endpoint: &str) -> Result<Channel> {
let endpoint = endpoint.trim();
if let Some(path) = endpoint.strip_prefix("unix://") {
return connect_unix_endpoint(PathBuf::from(path)).await;
}
Endpoint::from_shared(endpoint.to_string())
.map_err(|e| {
InterceptorError::Config(format!("invalid interceptor endpoint '{endpoint}': {e}"))
})?
let ep = Endpoint::from_shared(endpoint.to_string()).map_err(|e| {
InterceptorError::Config(format!("invalid interceptor endpoint '{endpoint}': {e}"))
})?;
tune_endpoint(ep)
.connect()
.await
.map_err(|e| InterceptorError::Transport(format!("connect {endpoint}: {e}")))
Expand All @@ -874,7 +890,7 @@ async fn connect_endpoint(endpoint: &str) -> Result<Channel> {
#[cfg(unix)]
async fn connect_unix_endpoint(path: PathBuf) -> Result<Channel> {
let display = path.display().to_string();
Endpoint::from_static("http://[::]:50051")
tune_endpoint(Endpoint::from_static("http://[::]:50051"))
.connect_with_connector(service_fn(move |_: Uri| {
let path = path.clone();
async move { UnixStream::connect(path).await.map(TokioIo::new) }
Expand Down
Loading