diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2018-06-08 14:19:46 -0700 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2018-06-08 14:19:46 -0700 |
| commit | d2e357b10d087075e582434292ea05766cc9cc53 (patch) | |
| tree | df85aab8622e086826e8a9ad468cafb7767c5d6b /src/core/lib/iomgr/ev_epollex_linux.cc | |
| parent | 8b5e45a35b83908d7a5f1dae6f412929f70c90ef (diff) | |
Revert "Merge pull request #15685 from grpc/revert-15435-fix_shutdown_closed_socket"
This reverts commit 8b5e45a35b83908d7a5f1dae6f412929f70c90ef, reversing
changes made to 2ea5e1d1dee3d7d7219051723290293901e37fbc.
Diffstat (limited to 'src/core/lib/iomgr/ev_epollex_linux.cc')
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 7903297fc6..993ea9480e 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -438,7 +438,12 @@ 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))) { - shutdown(fd->fd, SHUT_RDWR); + 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); + } + } fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); |