Repair cluster prove tests for FB environment

Summary:

Several prove tests use the 'launch_cluster' function to set up a
clustered volume. This replies on using multiple local IP
addresses, one for each server. Since IPV6 provides only ::1 as
a local address, as opposed to IPv4's complete 127.x.x.x subnet,
this cannot work in a pure IPv6 environment.

However, FB systems do at least have enough IPv4 stack to talk
locally, so fix launch_cluster to work properly when default
transport is IPv6.

To do this:

1) explicitly set transport.address-family volume option to inet in
   launch_cluster().

2) teach glusterd to honor transport.address-family when connecting
   to peer glusterds in glusterd_friend_rpc_create(). Previously
   transport.address-family was used only for binding local socket,
   not for communicating with peers.

Test Plan:

prove -f --timer ./tests/basic/glusterd/arbiter-volume-probe.t

Reviewers:

Subscribers:

Tasks:

Blame Revision:

Change-Id: I077d8549dcdbe4919ac7df34856a4b2d1428cdb6
Signed-off-by: Kevin Vigor <kvigor@fb.com>
Reviewed-on: http://review.gluster.org/16225
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Shreyas Siravara <sshreyas@fb.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>

7 files changed, 42 insertions, 15 deletions

diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 8c9872cfa53..5d08114c8c5 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -911,7 +911,8 @@ glfs_mgmt_init (struct glfs *fs)
         if (!strcmp (cmd_args->volfile_server_transport, "unix")) {
                 ret = rpc_transport_unix_options_build (&options, host, 0);
         } else {
-                ret = rpc_transport_inet_options_build (&options, host, port);
+                ret = rpc_transport_inet_options_build (&options, host, port,
+                                                        NULL);
         }
 
 	if (ret)
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 9376990df7f..ea6d3ff7225 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -2149,7 +2149,8 @@ glusterfs_mgmt_init (glusterfs_ctx_t *ctx)
             !strcmp (cmd_args->volfile_server_transport, "unix")) {
                 ret = rpc_transport_unix_options_build (&options, host, 0);
         } else {
-                ret = rpc_transport_inet_options_build (&options, host, port);
+                ret = rpc_transport_inet_options_build (&options, host, port,
+                                                        NULL);
         }
         if (ret)
                 goto out;
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 1bae2eddfca..5556740ca81 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -665,23 +665,37 @@ out:
         return ret;
 }
 
+/** @brief build a dictionary containing basic transport options.
+ *
+ * @param[out] options: will be set to a newly created dictionary on success.
+ * @param[in]  hostname: desired target hostname.
+ * @param[in]  port: desired target port.
+ * @param[in]  addr_family (optional): desired address family. If NULL,
+ *             default will be used.
+ *
+ * @returns zero on success.
+ */
 int
 rpc_transport_inet_options_build (dict_t **options, const char *hostname,
-                                  int port)
+                                  int port, const char *addr_family)
 {
         dict_t          *dict = NULL;
         char            *host = NULL;
         int             ret = -1;
 #ifdef IPV6_DEFAULT
-        char            *addr_family = "inet6";
+        const char      *addr_family_default = "inet6";
 #else
-        char            *addr_family = "inet";
+        const char      *addr_family_default = "inet";
 #endif
 
         GF_ASSERT (options);
         GF_ASSERT (hostname);
         GF_ASSERT (port >= 1024);
 
+        if (!addr_family) {
+                addr_family = addr_family_default;
+        }
+
         dict = dict_new ();
         if (!dict)
                 goto out;
@@ -706,7 +720,8 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
                 goto out;
         }
 
-        ret = dict_set_str (dict, "address-family", addr_family);
+        ret = dict_set_str (dict, "transport.address-family",
+                            (char *)addr_family);
         if (ret) {
                 gf_log (THIS->name, GF_LOG_WARNING,
                         "failed to set address-family to %s", addr_family);
diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index f0add065065..0f555462ea4 100644
--- a/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
@@ -311,5 +311,6 @@ rpc_transport_unix_options_build (dict_t **options, char *filepath,
                                   int frame_timeout);
 
 int
-rpc_transport_inet_options_build (dict_t **options, const char *hostname, int port);
+rpc_transport_inet_options_build (dict_t **options, const char *hostname,
+                                  int port, const char *addr_family);
 #endif /* __RPC_TRANSPORT_H__ */
diff --git a/tests/cluster.rc b/tests/cluster.rc
index 467bbcb06e1..42547f09e37 100644
--- a/tests/cluster.rc
+++ b/tests/cluster.rc
@@ -46,17 +46,18 @@ function define_glusterds() {
         bopt="management.transport.socket.bind-address=${!h}";
         popt="--pid-file=${!b}/glusterd.pid";
         sopt="management.glusterd-sockfile=${!b}/glusterd/gd.sock"
+        aopt="*.transport.address-family=inet"
         #Get the logdir
         logdir=`gluster --print-logdir`
         #Fetch the testcases name and prefix the glusterd log with it
         logfile=`echo ${0##*/}`_glusterd$i.log
         lopt="--log-file=$logdir/$logfile"
         if [ "$2" == "-LDEBUG" ]; then
-            eval "glusterd_$i='glusterd -LDEBUG --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
-            eval "glusterd$i='glusterd -LDEBUG --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
+            eval "glusterd_$i='glusterd -LDEBUG --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt --xlator-option $aopt $lopt $popt'";
+            eval "glusterd$i='glusterd -LDEBUG --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt --xlator-option $aopt $lopt $popt'";
         else
-            eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
-            eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
+            eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt --xlator-option $aopt $lopt $popt'";
+            eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt --xlator-option $aopt $lopt $popt'";
         fi
     done
 }
diff --git a/xlators/features/snapview-server/src/snapview-server-mgmt.c b/xlators/features/snapview-server/src/snapview-server-mgmt.c
index fc2ff2ab10d..f5062971bf4 100644
--- a/xlators/features/snapview-server/src/snapview-server-mgmt.c
+++ b/xlators/features/snapview-server/src/snapview-server-mgmt.c
@@ -73,7 +73,7 @@ svs_mgmt_init (xlator_t *this)
         if (cmd_args->volfile_server)
                 host = cmd_args->volfile_server;
 
-        ret = rpc_transport_inet_options_build (&options, host, port);
+        ret = rpc_transport_inet_options_build (&options, host, port, NULL);
         if (ret) {
                 gf_log (this->name, GF_LOG_ERROR, "failed to build the "
                         "transport options");
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index bf62290d023..3c21b9755ea 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -3418,7 +3418,7 @@ glusterd_transport_keepalive_options_get (int *interval, int *time,
 
 int
 glusterd_transport_inet_options_build (dict_t **options, const char *hostname,
-                                       int port)
+                                       int port, char *addr_family)
 {
         dict_t  *dict = NULL;
         int32_t interval = -1;
@@ -3433,7 +3433,8 @@ glusterd_transport_inet_options_build (dict_t **options, const char *hostname,
                 port = GLUSTERD_DEFAULT_PORT;
 
         /* Build default transport options */
-        ret = rpc_transport_inet_options_build (&dict, hostname, port);
+        ret = rpc_transport_inet_options_build (&dict, hostname, port,
+                                                addr_family);
         if (ret)
                 goto out;
 
@@ -3470,6 +3471,7 @@ glusterd_friend_rpc_create (xlator_t *this, glusterd_peerinfo_t *peerinfo,
         int                       ret     = -1;
         glusterd_peerctx_t       *peerctx = NULL;
         data_t                   *data    = NULL;
+        char                     *addr_family = NULL;
 
         peerctx = GF_CALLOC (1, sizeof (*peerctx), gf_gld_mt_peerctx_t);
         if (!peerctx)
@@ -3485,9 +3487,15 @@ glusterd_friend_rpc_create (xlator_t *this, glusterd_peerinfo_t *peerinfo,
                                                          uniquely identify a
                                                          peerinfo */
 
+        if (dict_get_str(this->options, "transport.address-family",
+                         &addr_family)) {
+                addr_family = NULL;
+        }
+
         ret = glusterd_transport_inet_options_build (&options,
                                                      peerinfo->hostname,
-                                                     peerinfo->port);
+                                                     peerinfo->port,
+                                                     addr_family);
         if (ret)
                 goto out;