From 107840ffecca5e31d8363595656b262f092b2b01 Mon Sep 17 00:00:00 2001 From: Sree Kuchibhotla Date: Mon, 24 Jul 2017 18:45:09 -0700 Subject: [PATCH 1/2] Disable epoll1 unless explicitly requested --- src/core/lib/iomgr/ev_epoll1_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c index 8db4a92453b..dc48d73df90 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.c +++ b/src/core/lib/iomgr/ev_epoll1_linux.c @@ -1030,6 +1030,12 @@ static const grpc_event_engine_vtable vtable = { /* It is possible that GLIBC has epoll but the underlying kernel doesn't. * Create a dummy epoll_fd to make sure epoll support is available */ const grpc_event_engine_vtable *grpc_init_epoll1_linux(bool explicit_request) { + /* TODO(sreek): Temporarily disable this poller unless explicitly requested + * via GRPC_POLL_STRATEGY */ + if (!explicit_request) { + return NULL; + } + if (!grpc_has_wakeup_fd()) { return NULL; } From 9bf8342a93a158f0c5c78eb2b3f347d518025b11 Mon Sep 17 00:00:00 2001 From: Sree Kuchibhotla Date: Tue, 25 Jul 2017 11:34:46 -0700 Subject: [PATCH 2/2] enable epollsig --- src/core/lib/iomgr/ev_epollsig_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/iomgr/ev_epollsig_linux.c b/src/core/lib/iomgr/ev_epollsig_linux.c index 11067e39590..070d75e42a0 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.c +++ b/src/core/lib/iomgr/ev_epollsig_linux.c @@ -1730,7 +1730,7 @@ const grpc_event_engine_vtable *grpc_init_epollsig_linux( if (!is_grpc_wakeup_signal_initialized) { /* TODO(ctiller): when other epoll engines are ready, remove the true || to * force this to be explitly chosen if needed */ - if (explicit_request) { + if (true || explicit_request) { grpc_use_signal(SIGRTMIN + 6); } else { return NULL;