|
 |
14f8ab |
From 769263ad422e3c1069de0994ff2274044982b242 Mon Sep 17 00:00:00 2001
|
|
|
14f8ab |
From: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
14f8ab |
Date: Sun, 1 Sep 2019 12:01:09 +0530
|
|
|
14f8ab |
Subject: [PATCH 292/297] rpc: Update address family if it is not provide in
|
|
|
14f8ab |
cmd-line arguments
|
|
|
14f8ab |
|
|
|
14f8ab |
Problem: After enabling transport-type to inet6 and passed ipv6
|
|
|
14f8ab |
transport.socket.bind-address in glusterd.vol clients are
|
|
|
14f8ab |
not started.
|
|
|
14f8ab |
|
|
|
14f8ab |
Solution: Need to update address-family based on remote-address for
|
|
|
14f8ab |
all gluster client process
|
|
|
14f8ab |
|
|
|
14f8ab |
> Change-Id: Iaa3588cd87cebc45231bfd675745c1a457dc9b31
|
|
|
14f8ab |
> Fixes: bz#1747746
|
|
|
14f8ab |
> Credits: Amgad Saleh <amgad.saleh@nokia.com>
|
|
|
14f8ab |
> Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
14f8ab |
> (Cherry picked from commit 80b8cfe3f1386606bada97a76a0cad7acdf6b877)
|
|
|
14f8ab |
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23340/)
|
|
|
14f8ab |
|
|
|
14f8ab |
Change-Id: Iaa3588cd87cebc45231bfd675745c1a457dc9b31
|
|
|
14f8ab |
BUG: 1750241
|
|
|
14f8ab |
Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
14f8ab |
Reviewed-on: https://code.engineering.redhat.com/gerrit/181184
|
|
|
14f8ab |
Tested-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
14f8ab |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
14f8ab |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
14f8ab |
---
|
|
|
14f8ab |
rpc/rpc-transport/socket/src/name.c | 13 ++++++++++++-
|
|
|
14f8ab |
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
14f8ab |
|
|
|
14f8ab |
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
|
|
|
14f8ab |
index 7f18cc4..b473f3b 100644
|
|
|
14f8ab |
--- a/rpc/rpc-transport/socket/src/name.c
|
|
|
14f8ab |
+++ b/rpc/rpc-transport/socket/src/name.c
|
|
|
14f8ab |
@@ -214,6 +214,7 @@ af_inet_client_get_remote_sockaddr(rpc_transport_t *this,
|
|
|
14f8ab |
uint16_t remote_port = 0;
|
|
|
14f8ab |
struct addrinfo *addr_info = NULL;
|
|
|
14f8ab |
int32_t ret = 0;
|
|
|
14f8ab |
+ struct in6_addr serveraddr;
|
|
|
14f8ab |
|
|
|
14f8ab |
remote_host_data = dict_get(options, "remote-host");
|
|
|
14f8ab |
if (remote_host_data == NULL) {
|
|
|
14f8ab |
@@ -249,6 +250,13 @@ af_inet_client_get_remote_sockaddr(rpc_transport_t *this,
|
|
|
14f8ab |
goto err;
|
|
|
14f8ab |
}
|
|
|
14f8ab |
|
|
|
14f8ab |
+ /* Need to update transport-address family if address-family is not provide
|
|
|
14f8ab |
+ to command-line arguments
|
|
|
14f8ab |
+ */
|
|
|
14f8ab |
+ if (inet_pton(AF_INET6, remote_host, &serveraddr)) {
|
|
|
14f8ab |
+ sockaddr->sa_family = AF_INET6;
|
|
|
14f8ab |
+ }
|
|
|
14f8ab |
+
|
|
|
14f8ab |
/* TODO: gf_resolve is a blocking call. kick in some
|
|
|
14f8ab |
non blocking dns techniques */
|
|
|
14f8ab |
ret = gf_resolve_ip6(remote_host, remote_port, sockaddr->sa_family,
|
|
|
14f8ab |
@@ -522,7 +530,10 @@ socket_client_get_remote_sockaddr(rpc_transport_t *this,
|
|
|
14f8ab |
ret = -1;
|
|
|
14f8ab |
}
|
|
|
14f8ab |
|
|
|
14f8ab |
- if (*sa_family == AF_UNSPEC) {
|
|
|
14f8ab |
+ /* Address-family is updated based on remote_host in
|
|
|
14f8ab |
+ af_inet_client_get_remote_sockaddr
|
|
|
14f8ab |
+ */
|
|
|
14f8ab |
+ if (*sa_family != sockaddr->sa_family) {
|
|
|
14f8ab |
*sa_family = sockaddr->sa_family;
|
|
|
14f8ab |
}
|
|
|
14f8ab |
|
|
|
14f8ab |
--
|
|
|
14f8ab |
1.8.3.1
|
|
|
14f8ab |
|