[impala] 07/20: KUDU-2492: Make the use of SO_REUSEPORT conditional on it being defined

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tarmstrong pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/impala.git

commit cb2064eb374806d58331731974e826b7b0fd14b6
Author: Thomas Tauber-Marshall <tm...@cloudera.com>
AuthorDate: Thu Jul 5 11:45:00 2018 -0700

    KUDU-2492: Make the use of SO_REUSEPORT conditional on it being defined
    
    A recent commit to Kudu, "rpc: add experimental rpc_reuseport flag",
    added the use of the rpc flag SO_REUSEREPORT. This flag is not
    available with older versions of Linux, resulting in a compiler error.
    
    This patch avoids the compiler error with a macro that checks if
    SO_REUSEPORT is defined, and if it's not attempting to set it will
    return an error.
    
    --------------------------
    
    IMPALA-7302: This is cherry-picked to fix builds breaking on CentOS 6.4.
    Since some of our Jenkins machines are CentOS 6.4, and upgrading them
    to our new minimum supported OS of CentOS 6.8 is non-trivial, we cherry-
    pick this patch to temporarily unblock these builds until the Jenkins
    AMIs are upgraded.
    
    Change-Id: I042125cdaedafa5ebbc09e5a3c12112dfeec59a1
    Reviewed-on: http://gerrit.cloudera.org:8080/10994
    Reviewed-by: Thomas Marshall <th...@cmu.edu>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 be/src/kudu/util/net/socket.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/be/src/kudu/util/net/socket.cc b/be/src/kudu/util/net/socket.cc
index cc14702..bc3b525 100644
--- a/be/src/kudu/util/net/socket.cc
+++ b/be/src/kudu/util/net/socket.cc
@@ -245,10 +245,14 @@ Status Socket::SetReuseAddr(bool flag) {
 }
 
 Status Socket::SetReusePort(bool flag) {
-  int int_flag = flag ? 1 : 0;
-  RETURN_NOT_OK_PREPEND(SetSockOpt(SOL_SOCKET, SO_REUSEPORT, int_flag),
-                        "failed to set SO_REUSEPORT");
-  return Status::OK();
+  #ifdef SO_REUSEPORT
+    int int_flag = flag ? 1 : 0;
+    RETURN_NOT_OK_PREPEND(SetSockOpt(SOL_SOCKET, SO_REUSEPORT, int_flag),
+                          "failed to set SO_REUSEPORT");
+    return Status::OK();
+  #else
+    return Status::NotSupported("failed to set SO_REUSEPORT: protocol not available");
+  #endif
 }
 
 Status Socket::BindAndListen(const Sockaddr &sockaddr,