| commit | 28839ce3a8bfe1c83017b8045a131698f1a8c904 | [log] [tgz] |
|---|---|---|
| author | Noah Eisen <ncteisen@gmail.com> | Fri Dec 15 16:09:24 2017 -0800 |
| committer | GitHub <noreply@github.com> | Fri Dec 15 16:09:24 2017 -0800 |
| tree | ceac8c1edf71ef61bacf807e1a8f037cc3b330b9 | |
| parent | 2279cd4aa9f4d1757252f461237a4f720db569ee [diff] | |
| parent | c0b00c3f14e177ddbc49e9369d2277ea78476dc2 [diff] |
Merge pull request #13776 from ncteisen/executor-tsan Fix shutdown executor tsan bug
diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index b7288d5..67a0412 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc
@@ -242,7 +242,7 @@ } 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); }