Merge pull request #13776 from ncteisen/executor-tsan

Fix shutdown executor tsan bug
7 years ago · 28839ce3a8
parent 2279cd4aa9 c0b00c3f14
commit 28839ce3a8
1 changed files with 1 additions and 1 deletions
--- a/src/core/lib/iomgr/executor.cc
+++ b/src/core/lib/iomgr/executor.cc
@ -242,7 +242,7 @@ static void executor_push(grpc_closure* closure, grpc_error* error,
        }
        continue;
      }
-      if (grpc_closure_list_empty(ts->elems)) {
+      if (grpc_closure_list_empty(ts->elems) && !ts->shutdown) {
        GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED();
        gpr_cv_signal(&ts->cv);
      }