Skip to content

Commit c139487

Browse files
authored
Remove HTTP/2 keepalive configuration (#1149)
linkerd/linkerd2#5988 describes a situation where our keepalive settings are incompatible with with Go's gRPC library's behavior. Until we can implement behavior that does not conflict with common client/server implementations, it seems most prudent to simply disable these settings by default (leaving TCP-level keepalives unchanged).
1 parent bbb6e4f commit c139487

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

linkerd/app/src/env.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
391391
let server = ServerConfig {
392392
addr,
393393
keepalive,
394-
h2_settings: h2::Settings {
395-
keepalive_timeout: keepalive.into(),
396-
..h2_settings
397-
},
394+
h2_settings,
398395
};
399396
let cache_max_idle_age =
400397
outbound_cache_max_idle_age?.unwrap_or(DEFAULT_OUTBOUND_ROUTER_MAX_IDLE_AGE);
@@ -409,10 +406,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
409406
OUTBOUND_CONNECT_BASE,
410407
DEFAULT_OUTBOUND_CONNECT_BACKOFF,
411408
)?,
412-
h2_settings: h2::Settings {
413-
keepalive_timeout: keepalive.into(),
414-
..h2_settings
415-
},
409+
h2_settings,
416410
h1_settings: h1::PoolSettings {
417411
max_idle,
418412
idle_timeout: cache_max_idle_age,
@@ -453,10 +447,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
453447
let server = ServerConfig {
454448
addr,
455449
keepalive,
456-
h2_settings: h2::Settings {
457-
keepalive_timeout: keepalive.into(),
458-
..h2_settings
459-
},
450+
h2_settings,
460451
};
461452
let cache_max_idle_age =
462453
inbound_cache_max_idle_age?.unwrap_or(DEFAULT_INBOUND_ROUTER_MAX_IDLE_AGE);
@@ -471,10 +462,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
471462
INBOUND_CONNECT_BASE,
472463
DEFAULT_INBOUND_CONNECT_BACKOFF,
473464
)?,
474-
h2_settings: h2::Settings {
475-
keepalive_timeout: keepalive.into(),
476-
..h2_settings
477-
},
465+
h2_settings,
478466
h1_settings: h1::PoolSettings {
479467
max_idle,
480468
idle_timeout: cache_max_idle_age,

0 commit comments

Comments
 (0)