summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/common-utils.c
diff options
context:
space:
mode:
authorPrasanna Kumar Kalever <prasanna.kalever@redhat.com>2015-06-24 12:21:02 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-07-26 21:31:39 -0700
commit9442e7bf80f5c2189140918bb5588868204521ed (patch)
tree8a480391111ac4c86b0ba7da96146befa3ac1bd6 /libglusterfs/src/common-utils.c
parente9b86d0b575e8e59f0910874341a4a05574124cf (diff)
rpc: fix binding brick issue while bind-insecure is enabled
problem: When bind-insecure is turned on (which is the default now), it may happen that brick is not able to bind to port assigned by Glusterd for example 49192-49195... It seems to occur because the rpc_clnt connections are binding to ports in the same range. so brick fails to bind to a port which is already used by someone else solution: fix for now is to make rpc_clnt to get port numbers from 65535 in a descending order, as a result port clash is minimized other fixes: previously rdma binds to port >= 1024 if it cannot find a free port < 1024, even when bind insecure was turned off(ref to commit '0e3fd04e'), this patch add's a check for bind-insecure in gf_rdma_client_bind function This patch also re-enable bind-insecure and allow insecure by default which was reverted (ref: commit cef1720) previously Change-Id: Ia1cfa93c5454e2ae0ff57813689b75de282ebd07 BUG: 1238661 Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com> Reviewed-on: http://review.gluster.org/11512 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'libglusterfs/src/common-utils.c')
-rw-r--r--libglusterfs/src/common-utils.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 156d7cb52fd..2d61b40fd0c 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -2789,7 +2789,7 @@ out:
}
int
-gf_process_reserved_ports (gf_boolean_t *ports)
+gf_process_reserved_ports (gf_boolean_t *ports, uint32_t ceiling)
{
int ret = -1;
#if defined GF_LINUX_HOST_OS
@@ -2809,7 +2809,7 @@ gf_process_reserved_ports (gf_boolean_t *ports)
blocked_port = strtok_r (ports_info, ",\n",&tmp);
while (blocked_port) {
- gf_ports_reserved (blocked_port, ports);
+ gf_ports_reserved (blocked_port, ports, ceiling);
blocked_port = strtok_r (NULL, ",\n", &tmp);
}
@@ -2822,7 +2822,7 @@ out:
}
gf_boolean_t
-gf_ports_reserved (char *blocked_port, gf_boolean_t *ports)
+gf_ports_reserved (char *blocked_port, gf_boolean_t *ports, uint32_t ceiling)
{
gf_boolean_t result = _gf_false;
char *range_port = NULL;
@@ -2834,7 +2834,7 @@ gf_ports_reserved (char *blocked_port, gf_boolean_t *ports)
if (blocked_port[strlen(blocked_port) -1] == '\n')
blocked_port[strlen(blocked_port) -1] = '\0';
if (gf_string2int16 (blocked_port, &tmp_port1) == 0) {
- if (tmp_port1 > (GF_CLIENT_PORT_CEILING - 1)
+ if (tmp_port1 > ceiling
|| tmp_port1 < 0) {
gf_msg ("glusterfs-socket", GF_LOG_WARNING, 0,
LG_MSG_INVALID_PORT, "invalid port %d",
@@ -2860,8 +2860,8 @@ gf_ports_reserved (char *blocked_port, gf_boolean_t *ports)
goto out;
}
if (gf_string2int16 (range_port, &tmp_port1) == 0) {
- if (tmp_port1 > (GF_CLIENT_PORT_CEILING - 1))
- tmp_port1 = GF_CLIENT_PORT_CEILING - 1;
+ if (tmp_port1 > ceiling)
+ tmp_port1 = ceiling;
if (tmp_port1 < 0)
tmp_port1 = 0;
}
@@ -2874,9 +2874,8 @@ gf_ports_reserved (char *blocked_port, gf_boolean_t *ports)
if (range_port[strlen(range_port) -1] == '\n')
range_port[strlen(range_port) - 1] = '\0';
if (gf_string2int16 (range_port, &tmp_port2) == 0) {
- if (tmp_port2 >
- (GF_CLIENT_PORT_CEILING - 1))
- tmp_port2 = GF_CLIENT_PORT_CEILING - 1;
+ if (tmp_port2 > ceiling)
+ tmp_port2 = ceiling;
if (tmp_port2 < 0)
tmp_port2 = 0;
}