Merge pull request #14215 from jtattermusch/fix_bad_merge_magic_number

tcp_posix.cc: Magic number 13 probably a typo in manual merge
7 years ago · 27909dcf46
parent ef4df60110 219c512f54
commit 27909dcf46
1 changed files with 1 additions and 1 deletions
--- 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",