diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-01-31 00:46:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 00:46:56 +0100 |
| commit | 27909dcf46f08179ba7f39f3a8b4588c5030d4a8 (patch) | |
| tree | f457ba3484226cae79fad2d5cc1b1d86157314ce | |
| parent | ef4df6011019e21f54d7b0cbfc5444b9112168d7 (diff) | |
| parent | 219c512f54728677bd01a06cbfaf1f1021dfbd96 (diff) | |
| download | grpc-grpc-27909dcf46f08179ba7f39f3a8b4588c5030d4a8.tar.gz | |
Merge pull request #14215 from jtattermusch/fix_bad_merge_magic_number
tcp_posix.cc: Magic number 13 probably a typo in manual merge
| -rw-r--r-- | src/core/lib/iomgr/tcp_posix.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 0ec5926227..4d16154a44 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -130,7 +130,7 @@ static void run_poller(void* bp, grpc_error* error_ignored) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p); } gpr_mu_lock(p->pollset_mu); - grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC; + grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC; GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(); GRPC_LOG_IF_ERROR( "backup_poller:pollset_work", |