aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2018-07-27 16:40:23 -0700
committerGravatar GitHub <noreply@github.com>2018-07-27 16:40:23 -0700
commitfef37e8163bbe4ccdc8a0c9bfe6f9b518a0957b4 (patch)
treedcf85d783d2134d49869e1a4c260b21ea2035d3d /src/core
parent69553c9855cab7d354c07dc02666a7eab72de395 (diff)
parentc137d233420092f6d7c0da88b315d6c336767ded (diff)
Merge pull request #16166 from yashykt/dontabortonerr
Don't abort on notify_on_error for poll. Instead simply schedule clos…
Diffstat (limited to 'src/core')
-rw-r--r--src/core/lib/iomgr/ev_poll_posix.cc6
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 ff4888eeb8..a4a83c4ad7 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 uint32_t fd_begin_poll(grpc_fd* fd, grpc_pollset* pollset,