diff options
author | 2018-06-08 16:52:34 +0200 | |
---|---|---|
committer | 2018-06-08 16:52:34 +0200 | |
commit | 8b5e45a35b83908d7a5f1dae6f412929f70c90ef (patch) | |
tree | a2f8f8b62cb51fdc408639be923dadd1e884d663 /src/core/lib/iomgr | |
parent | 2ea5e1d1dee3d7d7219051723290293901e37fbc (diff) | |
parent | 61278f3aa72b8032f54728e6847b9655acb38ed2 (diff) |
Merge pull request #15685 from grpc/revert-15435-fix_shutdown_closed_socket
Revert "Fix shutdown of closed fd when c-ares opens a second fd"
Diffstat (limited to 'src/core/lib/iomgr')
-rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 993ea9480e..7903297fc6 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -438,12 +438,7 @@ static bool fd_is_shutdown(grpc_fd* fd) { /* Might be called multiple times */ static void fd_shutdown(grpc_fd* fd, grpc_error* why) { if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { - if (shutdown(fd->fd, SHUT_RDWR)) { - if (errno != ENOTCONN) { - gpr_log(GPR_ERROR, "Error shutting down fd %d. errno: %d", - grpc_fd_wrapped_fd(fd), errno); - } - } + shutdown(fd->fd, SHUT_RDWR); fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); |