diff options
author | Yash Tibrewal <yashkt@google.com> | 2018-07-30 11:41:46 -0700 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2018-07-30 11:41:46 -0700 |
commit | c777bd2c44031653bc2c9183786ba91e2de77eb7 (patch) | |
tree | c8dfee5a794799daea1519420de6353a20f7dd3e /src/core/lib/iomgr/ev_poll_posix.cc | |
parent | 8f82ae36685927ff0f34b02ce86eb6464862be98 (diff) | |
parent | 48d05520ac899c10cdbaffe0210adf7657d2b162 (diff) |
Merge branch 'master' into pollforceset
Diffstat (limited to 'src/core/lib/iomgr/ev_poll_posix.cc')
-rw-r--r-- | src/core/lib/iomgr/ev_poll_posix.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 900e048d51..fb4c71ef71 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -532,8 +532,10 @@ static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { } static void fd_notify_on_error(grpc_fd* fd, grpc_closure* closure) { - gpr_log(GPR_ERROR, "Polling engine does not support tracking errors."); - abort(); + if (grpc_polling_trace.enabled()) { + gpr_log(GPR_ERROR, "Polling engine does not support tracking errors."); + } + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CANCELLED); } static void fd_set_readable(grpc_fd* fd) { |