diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2018-03-23 11:08:23 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-23 11:08:23 -0700 |
| commit | 9e4d954077db20b259ae2edd3ac61f2c3f5c7d61 (patch) | |
| tree | ccdc62b5ba35af88355f8e3a523fa9b70c345ef8 /src | |
| parent | 90af9346de2e4e6f0d45b130ce0de3d08d075c3f (diff) | |
| parent | 236bec52579f6cd32924883b885c0f2a1f6d2087 (diff) | |
Merge pull request #14780 from muxi/fix-keepalive
Keepalive watchdog timer used a wrong timeout value
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index a4d616d778..bd588e3c9b 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -2630,7 +2630,7 @@ static void start_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive watchdog"); grpc_timer_init(&t->keepalive_watchdog_timer, - grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_timeout, &t->keepalive_watchdog_fired_locked); } |