diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-11-02 11:17:03 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-02 11:17:03 -0700 |
| commit | 7a08e3b679e5a63f30fda6b426d57146f9984092 (patch) | |
| tree | 73eb715e66036870f8622a6b9bf7aea96ed8fb4d /src/core/lib/iomgr/socket_utils_common_posix.cc | |
| parent | 5e9c9792b5cd958d8cdf1e55bb03030e2e7c2959 (diff) | |
| parent | 24ca03dad7e91ebc49cfb7da5d825bde7c3b0557 (diff) | |
Merge pull request #17083 from yashykt/tcpusertimeout
Do not make TCP_USER_TIMEOUT failure an error
Diffstat (limited to 'src/core/lib/iomgr/socket_utils_common_posix.cc')
| -rw-r--r-- | src/core/lib/iomgr/socket_utils_common_posix.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index bdfc1d70c3..c4b3a9336d 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -302,8 +302,9 @@ grpc_error* grpc_set_socket_tcp_user_timeout( return GRPC_OS_ERROR(errno, "getsockopt(TCP_USER_TIMEOUT)"); } if (newval != timeout) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Failed to set TCP_USER_TIMEOUT"); + /* Do not fail on failing to set TCP_USER_TIMEOUT for now. */ + gpr_log(GPR_ERROR, "Failed to set TCP_USER_TIMEOUT"); + return GRPC_ERROR_NONE; } } #else |