gluster: IPv6 single stack support

Summary:
- This diff changes all locations in the code to prefer inet6 family
  instead of inet.  This will allow change GlusterFS to operate
  via IPv6 instead of IPv4 for all internal operations while still
  being able to serve (FUSE or NFS) clients via IPv4.
- The changes apply to NFS as well.
- This diff ports D1892990, D1897341 & D1896522 to the 3.8 branch.

Test Plan: Prove tests!

Reviewers: dph, rwareing

Signed-off-by: Shreyas Siravara <sshreyas@fb.com>

Change-Id: I34fdaaeb33c194782255625e00616faf75d60c33
Reviewed-on: http://review.gluster.org/16059
Reviewed-by: Shreyas Siravara <sshreyas@fb.com>
Tested-by: Shreyas Siravara <sshreyas@fb.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>

18 files changed, 376 insertions, 25 deletions

diff --git a/cli/src/cli.c b/cli/src/cli.c
index 518ae265f22..77d2a410fb4 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -588,6 +588,11 @@ cli_rpc_init (struct cli_state *state)
         int                     ret = -1;
         int                     port = CLI_GLUSTERD_PORT;
         xlator_t                *this = NULL;
+#ifdef IPV6_DEFAULT
+        char                    *addr_family = "inet6";
+#else
+        char                    *addr_family = "inet";
+#endif
 
         this = THIS;
         cli_rpc_prog = &cli_prog;
@@ -623,7 +628,8 @@ cli_rpc_init (struct cli_state *state)
                         goto out;
 
                 ret = dict_set_str (options, "transport.address-family",
-                                    "inet");
+                                        addr_family);
+
                 if (ret)
                         goto out;
         }
diff --git a/configure.ac b/configure.ac
index ac46911ab85..713e5ada83d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,14 @@ if test "x$enable_debug" = "xyes"; then
         CFLAGS="${CFLAGS} -g -O0 -DDEBUG"
 else
         BUILD_DEBUG=no
-        CFLAGS="${CFLAGS} -g -O2"
+        CFLAGS="${CFLAGS} -g"
+fi
+
+AC_ARG_WITH([fbextras], AC_HELP_STRING([--with-fbextras], [Enable Facebook specific extras.]))
+if test "x$with_fbextras" = "xyes"; then
+        BUILD_FBEXTRAS=yes
+else
+        BUILD_FBEXTRAS=no
 fi
 
 case $host_os in
@@ -908,6 +915,13 @@ AC_SUBST(GF_DISTRIBUTION)
 GF_HOST_OS=""
 GF_LDFLAGS="-rdynamic"
 
+dnl include tirpc for FB builds
+if test "x$BUILD_FBEXTRAS" = "xyes"; then
+        TIRPC_CFLAGS="-I/usr/include/tirpc"
+        GF_LDFLAGS="-lfbtirpc $GF_LDFLAGS"
+        GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS -DIPV6_DEFAULT"
+fi
+
 dnl check for gcc -Werror=format-security
 saved_CFLAGS=$CFLAGS
 CFLAGS="-Wformat -Werror=format-security"
@@ -1294,6 +1308,7 @@ AC_SUBST([GF_CPPFLAGS])
 AM_CONDITIONAL([GF_LINUX_HOST_OS], test "${GF_HOST_OS}" = "GF_LINUX_HOST_OS")
 AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")
 AM_CONDITIONAL([GF_BSD_HOST_OS], test "${GF_HOST_OS}" = "GF_BSD_HOST_OS")
+AM_CONDITIONAL([GF_FBEXTRAS], test "${BUILD_FBEXTRAS}" = "yes")
 
 AC_SUBST(GLUSTERD_WORKDIR)
 AM_CONDITIONAL([GF_INSTALL_GLUSTERD_WORKDIR], test ! -d ${GLUSTERD_WORKDIR} && test -d ${sysconfdir}/glusterd )
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 3a2586682f9..94dbb96c81c 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -13,6 +13,10 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with debug
 %{?_with_debug:%global _with_debug --enable-debug}
 
+# if you wish to compile an rpm with Facebook specfic extras...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with fbextras
+%{?_with_fbextras:%global _with_fbextras --with-fbextras}
+
 # if you wish to compile an rpm with cmocka unit testing...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka
 %{?_with_cmocka:%global _with_cmocka --enable-cmocka}
@@ -196,6 +200,9 @@ BuildRequires:    libxml2-devel openssl-devel
 BuildRequires:    libaio-devel libacl-devel
 BuildRequires:    python-devel
 BuildRequires:    python-ctypes
+%if ( 0%{?_with_fbextras:1} )
+BuildRequires:    fb-libtirpc fb-libtirpc-devel
+%endif
 BuildRequires:    userspace-rcu-devel >= 0.7
 %if ( 0%{?rhel} && 0%{?rhel} <= 6 )
 BuildRequires:    automake
@@ -513,6 +520,9 @@ Requires:         %{name}-cli%{?_isa} = %{version}-%{release}
 Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
 # some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse
 Requires:         %{name}-fuse%{?_isa} = %{version}-%{release}
+%if ( 0%{?_with_fbextras:1} )
+Requires:         fb-libtirpc >= 0.2.5-1
+%endif
 # self-heal daemon, rebalance, nfs-server etc. are actually clients
 Requires:         %{name}-api%{?_isa} = %{version}-%{release}
 Requires:         %{name}-client-xlators%{?_isa} = %{version}-%{release}
@@ -596,7 +606,8 @@ export CFLAGS
         %{?_without_ocf} \
         %{?_without_rdma} \
         %{?_without_syslog} \
-        %{?_without_tiering}
+        %{?_without_tiering} \
+        %{?_with_fbextras}
 
 # fix hardening and remove rpath in shlibs
 %if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 18f445ae265..6a5889207d4 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -181,26 +181,16 @@ gf_rev_dns_lookup (const char *ip)
 {
         char               *fqdn = NULL;
         int                ret  = 0;
-        struct sockaddr_in sa   = {0};
-        char               host_addr[256] = {0, };
 
         GF_VALIDATE_OR_GOTO ("resolver", ip, out);
 
-        sa.sin_family = AF_INET;
-        inet_pton (AF_INET, ip, &sa.sin_addr);
-        ret = getnameinfo ((struct sockaddr *)&sa, sizeof (sa), host_addr,
-                          sizeof (host_addr), NULL, 0, 0);
-
+        /* Get the FQDN */
+        ret =  gf_get_hostname_from_ip ((char *)ip, &fqdn);
         if (ret != 0) {
                 gf_msg ("resolver", GF_LOG_INFO, errno,
                         LG_MSG_RESOLVE_HOSTNAME_FAILED, "could not resolve "
                         "hostname for %s", ip);
-                goto out;
         }
-
-        /* Get the FQDN */
-        fqdn = gf_strdup (host_addr);
-
 out:
        return fqdn;
 }
@@ -3107,11 +3097,13 @@ gf_get_hostname_from_ip (char *client_ip, char **hostname)
         char                    *client_ip_copy               = NULL;
         char                    *tmp                          = NULL;
         char                    *ip                           = NULL;
+        size_t                   addr_sz                      = 0;
 
         /* if ipv4, reverse lookup the hostname to
          * allow FQDN based rpc authentication
          */
-        if (valid_ipv4_address (client_ip, strlen (client_ip), 0) == _gf_false) {
+        if (!valid_ipv6_address (client_ip, strlen (client_ip), 0) &&
+            !valid_ipv4_address (client_ip, strlen (client_ip), 0)) {
                 /* most times, we get a.b.c.d:port form, so check that */
                 client_ip_copy = gf_strdup (client_ip);
                 if (!client_ip_copy)
@@ -3124,12 +3116,14 @@ gf_get_hostname_from_ip (char *client_ip, char **hostname)
 
         if (valid_ipv4_address (ip, strlen (ip), 0) == _gf_true) {
                 client_sockaddr = (struct sockaddr *)&client_sock_in;
+                addr_sz = sizeof (client_sock_in);
                 client_sock_in.sin_family = AF_INET;
                 ret = inet_pton (AF_INET, ip,
                                  (void *)&client_sock_in.sin_addr.s_addr);
 
         } else if (valid_ipv6_address (ip, strlen (ip), 0) == _gf_true) {
                 client_sockaddr = (struct sockaddr *) &client_sock_in6;
+                addr_sz = sizeof (client_sock_in6);
 
                 client_sock_in6.sin6_family = AF_INET6;
                 ret = inet_pton (AF_INET6, ip,
@@ -3143,8 +3137,14 @@ gf_get_hostname_from_ip (char *client_ip, char **hostname)
                 goto out;
         }
 
+        /* You cannot just use sizeof (*client_sockaddr), as per the man page
+         * the (getnameinfo) size must be the size of the underlying sockaddr
+         * struct e.g. sockaddr_in6 or sockaddr_in.  Failure to do so will
+         * break IPv6 hostname resolution (IPv4 will work only because
+         * the sockaddr_in struct happens to be of the correct size).
+         */
         ret = getnameinfo (client_sockaddr,
-                           sizeof (*client_sockaddr),
+                           addr_sz,
                            client_hostname, sizeof (client_hostname),
                            NULL, 0, 0);
         if (ret) {
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index 69adfbcd7fe..33388598b1e 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -463,6 +463,8 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
 #define ST_CTIM_NSEC_SET(stbuf, val) do { } while (0);
 #endif
 
+#ifndef IPV6_DEFAULT
+
 #ifndef IXDR_GET_LONG
 #define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))
 #endif
@@ -479,6 +481,8 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
 #define IXDR_PUT_U_LONG(buf, v)       IXDR_PUT_LONG(buf, (long)(v))
 #endif
 
+#endif /* IPV6_DEFAULT */
+
 #if defined(__GNUC__) && !defined(RELAX_POISONING)
 /* Use run API, see run.h */
 #include <stdlib.h> /* system(), mkostemp() */
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 22324fb9994..1bae2eddfca 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -672,6 +672,11 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
         dict_t          *dict = NULL;
         char            *host = NULL;
         int             ret = -1;
+#ifdef IPV6_DEFAULT
+        char            *addr_family = "inet6";
+#else
+        char            *addr_family = "inet";
+#endif
 
         GF_ASSERT (options);
         GF_ASSERT (hostname);
@@ -701,6 +706,13 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
                 goto out;
         }
 
+        ret = dict_set_str (dict, "address-family", addr_family);
+        if (ret) {
+                gf_log (THIS->name, GF_LOG_WARNING,
+                        "failed to set address-family to %s", addr_family);
+                goto out;
+        }
+
         ret = dict_set_str (dict, "transport-type", "socket");
         if (ret) {
                 gf_log (THIS->name, GF_LOG_WARNING,
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index f07e745a4b3..9dc3bff427c 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -37,6 +37,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef IPV6_DEFAULT
+#include <netconfig.h>
+#endif
+
 #include "xdr-rpcclnt.h"
 #include "glusterfs-acl.h"
 
@@ -1363,6 +1367,82 @@ rpcsvc_error_reply (rpcsvc_request_t *req)
         return rpcsvc_submit_generic (req, &dummyvec, 0, NULL, 0, NULL);
 }
 
+#ifdef IPV6_DEFAULT
+int
+rpcsvc_program_register_rpcbind6 (rpcsvc_program_t *newprog, uint32_t port)
+{
+        const int IP_BUF_LEN = 64;
+        char addr_buf[IP_BUF_LEN];
+
+        int err = 0;
+        bool_t success = 0;
+        struct netconfig *nc;
+        struct netbuf *nb;
+
+        if (!newprog) {
+                goto out;
+        }
+
+        nc = getnetconfigent ("tcp6");
+        if (!nc) {
+                err = -1;
+                goto out;
+        }
+
+
+        err = sprintf (addr_buf, "::.%d.%d", port >> 8 & 0xff,
+                       port & 0xff);
+        if (err < 0) {
+                err = -1;
+                goto out;
+        }
+
+        nb = uaddr2taddr (nc, addr_buf);
+        if (!nb) {
+                err = -1;
+                goto out;
+        }
+
+        success = rpcb_set (newprog->prognum, newprog->progver, nc, nb);
+        if (!success) {
+                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Could not register the IPv6"
+                                                 " service with rpcbind");
+        }
+
+        err = 0;
+
+out:
+        return err;
+}
+
+int
+rpcsvc_program_unregister_rpcbind6 (rpcsvc_program_t *newprog)
+{
+        int err = 0;
+        bool_t success = 0;
+        struct netconfig *nc;
+
+        if (!newprog) {
+                goto out;
+        }
+
+        nc = getnetconfigent ("tcp6");
+        if (!nc) {
+                err = -1;
+                goto out;
+        }
+
+        success = rpcb_unset (newprog->prognum, newprog->progver, nc);
+        if (!success) {
+                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Could not unregister the IPv6"
+                                                 " service with rpcbind");
+        }
+
+        err = 0;
+out:
+        return err;
+}
+#endif
 
 /* Register the program with the local portmapper service. */
 int
@@ -1527,7 +1607,14 @@ rpcsvc_program_unregister (rpcsvc_t *svc, rpcsvc_program_t *program)
                         " program failed");
                 goto out;
         }
-
+#ifdef IPV6_DEFAULT
+        ret = rpcsvc_program_unregister_rpcbind6 (program);
+        if (ret == -1) {
+                gf_log (GF_RPCSVC, GF_LOG_ERROR, "rpcbind (ipv6)"
+                        " unregistration of program failed");
+                goto out;
+        }
+#endif
         pthread_mutex_lock (&svc->rpclock);
         {
                 list_for_each_entry (prog, &svc->programs, program) {
diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index 02e467e68a7..1032df03b0e 100644
--- a/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
@@ -437,6 +437,11 @@ rpcsvc_listener_destroy (rpcsvc_listener_t *listener);
 extern int
 rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port);
 
+#ifdef IPV6_DEFAULT
+extern int
+rpcsvc_program_register_rpcbind6 (rpcsvc_program_t *newprog, uint32_t port);
+#endif
+
 extern int
 rpcsvc_program_unregister_portmap (rpcsvc_program_t *newprog);
 
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
index 0e34dc211fe..056eb790628 100644
--- a/rpc/rpc-transport/socket/src/name.c
+++ b/rpc/rpc-transport/socket/src/name.c
@@ -557,6 +557,14 @@ server_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
         data_t  *address_family_data = NULL;
         int32_t  ret                 = -1;
 
+#ifdef IPV6_DEFAULT
+        char *addr_family            = "inet6";
+        sa_family_t default_family   = AF_INET6;
+#else
+        char *addr_family            = "inet";
+        sa_family_t default_family   = AF_INET;
+#endif
+
         GF_VALIDATE_OR_GOTO ("socket", sa_family, out);
 
         address_family_data = dict_get (this->options,
@@ -581,8 +589,9 @@ server_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
                 }
         } else {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "option address-family not specified, defaulting to inet");
-                *sa_family = AF_INET;
+                        "option address-family not specified, "
+                        "defaulting to %s", addr_family);
+                *sa_family = default_family;
         }
 
         ret = 0;
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 4244883a5db..bfcc01b73b7 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -3009,6 +3009,21 @@ socket_connect (rpc_transport_t *this, int port)
                         }
                 }
 
+                /* Make sure we are not vulnerable to someone setting
+                 * net.ipv6.bindv6only to 1 so that gluster services are
+                 * avalable over IPv4 & IPv6.
+                 */
+                int disable_v6only = 0;
+
+                if (setsockopt (priv->sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                                (void *)&disable_v6only,
+                                sizeof (disable_v6only)) < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                               "Error disabling sockopt IPV6_V6ONLY: \"%s\"",
+                               strerror (errno));
+                }
+
+
                 if (priv->nodelay && (sa_family != AF_UNIX)) {
                         ret = __socket_nodelay (priv->sock);
 
diff --git a/tests/basic/accept-v6v4.t b/tests/basic/accept-v6v4.t
new file mode 100644
index 00000000000..7128c12c6be
--- /dev/null
+++ b/tests/basic/accept-v6v4.t
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+. $(dirname $0)/../nfs.rc
+
+#
+# This test ensures that GlusterFS provides NFS, Mount and its Management daemon
+# over both IPv4 and IPv6. It uses netcat to check the services running on both
+# IPv4 & IPv6 addresses as well as a mount to test that mount & nfs work.
+#
+
+IPV4_SUPPORT=false
+IPV6_SUPPORT=false
+
+host $HOSTNAME | grep -q "has address" && IPV4_SUPPORT=true
+host $HOSTNAME | grep -q "has IPv6 address" && IPV6_SUPPORT=true
+
+. $(dirname $0)/../include.rc
+
+cleanup;
+
+mkdir -p $B0/b{0,1,2}
+
+# make sure no registered rpcbind services are running
+service rpcbind restart
+
+TEST glusterd
+TEST pidof glusterd
+
+TEST $CLI vol create $V0 replica 3 $H0:$B0/b0 $H0:$B0/b1 $H0:$B0/b2
+
+TEST $CLI vol set $V0 cluster.self-heal-daemon off
+TEST $CLI vol set $V0 nfs.disable off
+TEST $CLI vol set $V0 cluster.choose-local off
+TEST $CLI vol start $V0
+
+MOUNTD_PORT=38465
+MGMTD_PORT=24007
+NFSD_PORT=2049
+
+function check_ip_port {
+        ip=$1
+        port=$2
+        type=$3
+
+        nc_flags=""
+        if [ "$type" == "v6" ] && [ "$ip" == "NONE" ]; then
+          echo "Y"
+          return
+        else
+          nc_flags="-6"
+        fi
+
+        if [ "$type" == "v4" ] && [ "$ip" == "NONE" ]; then
+          echo "Y"
+          return
+        fi
+
+        if exec 3<>/dev/tcp/$ip/$port; then
+          echo "Y"
+        else
+          echo "N"
+        fi
+}
+
+function check_nfs {
+        ip=$1
+        type=$2
+
+        if [ "$ip" == "NONE" ]; then
+          echo "Y"
+          return
+        fi
+
+        if [ "$type" == "v6" ]; then
+          addr="[$ip]"
+        else
+          addr="$ip"
+        fi
+
+        if mount_nfs $addr:/$V0 $N0; then
+          umount_nfs $N0
+          echo "Y"
+        else
+          echo "N"
+        fi
+}
+
+if [ ! $IPV4_SUPPORT ] && [ ! $IPV6_SUPPORT ]; then
+  exit 1
+fi
+
+# Get the V4 & V6 addresses of this host
+if $IPV4_SUPPORT; then
+  V4=$(host $HOSTNAME | head -n1 | awk -F ' ' '{print $4}')
+else
+  V4="NONE"
+fi
+
+if $IPV6_SUPPORT; then
+  V6=$(host $HOSTNAME | tail -n1 | awk -F ' ' '{print $5}')
+else
+  V6="NONE"
+fi
+
+# First check the management daemon
+EXPECT "Y" check_ip_port $V6 $MGMTD_PORT "v6"
+EXPECT "Y" check_ip_port $V4 $MGMTD_PORT "v4"
+
+# Give the MOUNT/NFS Daemon some time to start up
+sleep 4
+
+EXPECT "Y" check_ip_port $V4 $MOUNTD_PORT "v6"
+EXPECT "Y" check_ip_port $V6 $MOUNTD_PORT "v4"
+
+EXPECT "Y" check_ip_port $V4 $NFSD_PORT "v6"
+EXPECT "Y" check_ip_port $V6 $NFSD_PORT "v4"
+
+# Mount the file system
+EXPECT "Y" check_nfs $V6 "v6"
+EXPECT "Y" check_nfs $V4 "v4"
+
+cleanup;
diff --git a/tests/basic/exports_parsing.t b/tests/basic/exports_parsing.t
index fdaf9c2822e..da88bbcb2cc 100644
--- a/tests/basic/exports_parsing.t
+++ b/tests/basic/exports_parsing.t
@@ -32,7 +32,20 @@ function test_bad_opt ()
         glusterfsd --print-exports $1 2>&1 | sed -n 1p
 }
 
-EXPECT_KEYWORD "/test @test(rw,anonuid=0,sec=sys,) 10.35.11.31(rw,anonuid=0,sec=sys,)" test_good_file $EXP_FILES/exports
+function check_export_line() {
+  if [ "$1" == "$2" ]; then
+     echo "Y"
+  else
+    echo "N"
+  fi
+  return
+}
+
+export_result=$(test_good_file $EXP_FILES/exports)
+EXPECT "Y" check_export_line '/test @test(rw,anonuid=0,sec=sys,) 10.35.11.31(rw,anonuid=0,sec=sys,) ' "$export_result"
+
+export_result=$(test_good_file $EXP_FILES/exports-v6)
+EXPECT "Y" check_export_line '/test @test(rw,anonuid=0,sec=sys,) 2401:db00:11:1:face:0:3d:0(rw,anonuid=0,sec=sys,) ' "$export_result"
 
 EXPECT_KEYWORD "Error parsing netgroups for:" test_bad_line $EXP_FILES/bad_exports
 EXPECT_KEYWORD "Error parsing netgroups for:" test_long_netgroup $EXP_FILES/bad_exports
diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t
index 9df5cb45c3b..cd0189788ba 100755
--- a/tests/basic/mount-nfs-auth.t
+++ b/tests/basic/mount-nfs-auth.t
@@ -15,6 +15,9 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info
 
+H0IP=$(ip addr show |grep -w inet |grep -v 127.0.0.1|awk '{ print $2 }'| cut -d "/" -f 1)
+H0IP6=$(host $HOSTNAME | grep IPv6 | awk '{print $NF}')
+
 # Export variables for allow & deny
 EXPORT_ALLOW="/$V0 $H0(sec=sys,rw,anonuid=0) @ngtop(sec=sys,rw,anonuid=0)"
 EXPORT_ALLOW_SLASH="/$V0/ $H0(sec=sys,rw,anonuid=0) @ngtop(sec=sys,rw,anonuid=0)"
@@ -37,6 +40,10 @@ function build_dirs () {
         mkdir -p $B0/b{0,1,2}/L1/L2/L3
 }
 
+function export_allow_this_host_ipv6 () {
+        printf "$EXPORT_ALLOW6\n" > /var/lib/glusterd/nfs/exports
+}
+
 function export_allow_this_host () {
         printf "$EXPORT_ALLOW\n" > ${NFSDIR}/exports
 }
@@ -186,6 +193,11 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
 
 ## Mount NFS
 EXPECT "Y" check_mount_success $V0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
+## Mount NFS using the IPv6 export
+export_allow_this_host_ipv6
+EXPECT "Y" check_mount_success $V0
 
 ## Disallow host
 TEST export_deny_this_host
diff --git a/tests/configfiles/exports-v6 b/tests/configfiles/exports-v6
new file mode 100644
index 00000000000..426b1ef5705
--- /dev/null
+++ b/tests/configfiles/exports-v6
@@ -0,0 +1 @@
+/test @test(rw,anonuid=0,sec=sys,) 2401:db00:11:1:face:0:3d:0(rw,anonuid=0,sec=sys,)
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index 72e14b0429d..0c56a90a6d3 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -286,6 +286,11 @@ __glusterd_handle_create_volume (rpcsvc_request_t *req)
         int32_t                 type        = 0;
         char                   *username    = NULL;
         char                   *password    = NULL;
+#ifdef IPV6_DEFAULT
+        char                   *addr_family = "inet6";
+#else
+        char                   *addr_family = "inet";
+#endif
 
         GF_ASSERT (req);
 
@@ -388,10 +393,11 @@ __glusterd_handle_create_volume (rpcsvc_request_t *req)
                 /* Setting default as inet for trans_type tcp */
                 ret = dict_set_dynstr_with_alloc (dict,
                                 "transport.address-family",
-                                "inet");
+                                addr_family);
                 if (ret) {
                         gf_log (this->name, GF_LOG_ERROR,
-                                "failed to set transport.address-family");
+                                "failed to set transport.address-family "
+                                "to %s", addr_family);
                         goto out;
                 }
         }
diff --git a/xlators/nfs/server/src/exports.h b/xlators/nfs/server/src/exports.h
index bc9af2f0b8b..0079b9a3deb 100644
--- a/xlators/nfs/server/src/exports.h
+++ b/xlators/nfs/server/src/exports.h
@@ -22,7 +22,7 @@
 #define GF_EXP GF_NFS"-exports"
 
 #define NETGROUP_REGEX_PATTERN  "(@([a-zA-Z0-9\\(=, .])+)())"
-#define HOSTNAME_REGEX_PATTERN  "[[:space:]]([a-zA-Z0-9.\\(=,*/)-]+)"
+#define HOSTNAME_REGEX_PATTERN  "[[:space:]]([a-zA-Z0-9.\\(=,*/:)-]+)"
 #define OPTIONS_REGEX_PATTERN   "([a-zA-Z0-9=\\.]+)"
 
 #define NETGROUP_MAX_LEN        128
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 2647e384a94..dd737850c11 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1896,7 +1896,7 @@ _mnt3_get_host_from_peer (const char *peer_addr)
         size_t host_len    = 0;
         char   *colon      = NULL;
 
-        colon = strchr (peer_addr, ':');
+        colon = strrchr (peer_addr, ':');
         if (!colon) {
                 gf_msg (GF_MNT, GF_LOG_ERROR, 0, NFS_MSG_BAD_PEER,
                         "Bad peer %s", peer_addr);
@@ -4123,6 +4123,15 @@ mnt1svc_init (xlator_t *nfsx)
                 }
         }
 
+#ifdef IPV6_DEFAULT
+        ret = dict_set_str (options, "transport.address-family", "inet6");
+        if (ret == -1) {
+                gf_log (GF_NFS, GF_LOG_ERROR,
+                        "dict_set_str error when trying to enable ipv6");
+              goto err;
+        }
+#endif
+
         ret = rpcsvc_create_listeners (nfs->rpcsvc, options, nfsx->name);
         if (ret == -1) {
                 gf_msg (GF_NFS, GF_LOG_ERROR, errno,
diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index ddfa89dab11..94d939ac1cb 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -204,6 +204,9 @@ nfs_program_register_portmap_all (struct nfs_state *nfs)
                 if (nfs->override_portnum)
                         prog->progport = nfs->override_portnum;
                 (void) rpcsvc_program_register_portmap (prog, prog->progport);
+#ifdef IPV6_DEFAULT
+                (void) rpcsvc_program_register_rpcbind6 (prog, prog->progport);
+#endif
         }
 
         return (0);
@@ -339,6 +342,17 @@ nfs_init_versions (struct nfs_state *nfs, xlator_t *this)
                                 if (version->required)
                                         goto err;
                         }
+#ifdef IPV6_DEFAULT
+                        ret = rpcsvc_program_register_rpcbind6 (prog,
+                                                                prog->progport);
+                        if (ret == -1) {
+                                gf_msg (GF_NFS, GF_LOG_ERROR, 0,
+                                        NFS_MSG_PGM_REG_FAIL,
+                                        "Program (ipv6) %s registration failed",
+                                        prog->progname);
+                                goto err;
+                        }
+#endif
                 }
 
         }
@@ -901,6 +915,16 @@ nfs_init_state (xlator_t *this)
                 }
         }
 
+#ifdef IPV6_DEFAULT
+        ret = dict_set_str (this->options, "transport.address-family",
+                                           "inet6");
+        if (ret == -1) {
+                gf_log (GF_NFS, GF_LOG_ERROR, "dict_set_str error");
+                goto free_foppool;
+        }
+#endif
+
+
         /* Right only socket support exists between nfs client and
          * gluster nfs, so we can set default value as socket
          */