commit 949d075812cb617eaf4d66a880869cb400f4440b
author Sree Kuchibhotla <sreek@google.com> Thu Jul 20 23:49:15 2017 -0700
committer Sree Kuchibhotla <sreek@google.com> Thu Jul 20 23:49:15 2017 -0700
tree e3b4041d63c815443058414fc4e92657e0eff299
parent 5d906568b4e876aba970c9bb28232d0c88e69ddc

Correctly fix the case where pollset->kicked_without_poller was missed

src/core/lib/iomgr/ev_epoll1_linux.c

diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c
index 77d5905..b89b8af 100644
--- a/src/core/lib/iomgr/ev_epoll1_linux.c
+++ b/src/core/lib/iomgr/ev_epoll1_linux.c
@@ -603,7 +603,7 @@
 
   worker_insert(pollset, worker);
   pollset->begin_refs--;
-  if (worker->kick_state == UNKICKED) {
+  if (worker->kick_state == UNKICKED && !pollset->kicked_without_poller) {
     GPR_ASSERT(gpr_atm_no_barrier_load(&g_active_poller) != (gpr_atm)worker);
     worker->initialized_cv = true;
     gpr_cv_init(&worker->cv);
@@ -623,10 +623,13 @@
     }
     *now = gpr_now(now->clock_type);
   }
+
   if (GRPC_TRACER_ON(grpc_polling_trace)) {
-    gpr_log(GPR_ERROR, "PS:%p BEGIN_DONE:%p kick_state=%s shutdown=%d", pollset,
-            worker, kick_state_string(worker->kick_state),
-            pollset->shutting_down);
+    gpr_log(GPR_ERROR,
+            "PS:%p BEGIN_DONE:%p kick_state=%s shutdown=%d "
+            "kicked_without_poller: %d",
+            pollset, worker, kick_state_string(worker->kick_state),
+            pollset->shutting_down, pollset->kicked_without_poller);
   }
 
   /* We release pollset lock in this function at a couple of places: