Merge pull request #17083 from yashykt/tcpusertimeout

Do not make TCP_USER_TIMEOUT failure an error
6 years ago · 7a08e3b679
parent 5e9c9792b5 24ca03dad7
commit 7a08e3b679
1 changed files with 3 additions and 2 deletions
--- 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