|
 |
21ab4e |
From c9e6e48b5a38c796d5c3f7139980a75753464610 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
21ab4e |
Date: Mon, 29 May 2017 16:19:40 +0530
|
|
|
21ab4e |
Subject: [PATCH 500/509] socket/reconfigure: reconfigure should be done on new
|
|
|
21ab4e |
dict
|
|
|
21ab4e |
|
|
|
21ab4e |
In socket reconfigure, reconfigurations are doing with old
|
|
|
21ab4e |
dict values. It should be with new reconfigured dict values
|
|
|
21ab4e |
|
|
|
21ab4e |
Backport of>
|
|
|
21ab4e |
>Change-Id: Iac5ad4382fe630806af14c99bb7950a288756a87
|
|
|
21ab4e |
>BUG: 1456405
|
|
|
21ab4e |
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
21ab4e |
>Reviewed-on: https://review.gluster.org/17412
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Iac5ad4382fe630806af14c99bb7950a288756a87
|
|
|
21ab4e |
BUG: 1453145
|
|
|
21ab4e |
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/108899
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
rpc/rpc-transport/socket/src/socket.c | 11 +++++------
|
|
|
21ab4e |
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
|
|
|
21ab4e |
index 10f59ee..16cba78 100644
|
|
|
21ab4e |
--- a/rpc/rpc-transport/socket/src/socket.c
|
|
|
21ab4e |
+++ b/rpc/rpc-transport/socket/src/socket.c
|
|
|
21ab4e |
@@ -3854,7 +3854,7 @@ reconfigure (rpc_transport_t *this, dict_t *options)
|
|
|
21ab4e |
|
|
|
21ab4e |
priv = this->private;
|
|
|
21ab4e |
|
|
|
21ab4e |
- if (dict_get_str (this->options, "transport.socket.keepalive",
|
|
|
21ab4e |
+ if (dict_get_str (options, "transport.socket.keepalive",
|
|
|
21ab4e |
&optstr) == 0) {
|
|
|
21ab4e |
if (gf_string2boolean (optstr, &tmp_bool) == -1) {
|
|
|
21ab4e |
gf_log (this->name, GF_LOG_ERROR,
|
|
|
21ab4e |
@@ -3871,7 +3871,7 @@ reconfigure (rpc_transport_t *this, dict_t *options)
|
|
|
21ab4e |
else
|
|
|
21ab4e |
priv->keepalive = 1;
|
|
|
21ab4e |
|
|
|
21ab4e |
- if (dict_get_uint32 (this->options, "transport.tcp-user-timeout",
|
|
|
21ab4e |
+ if (dict_get_uint32 (options, "transport.tcp-user-timeout",
|
|
|
21ab4e |
&timeout) == 0) {
|
|
|
21ab4e |
priv->timeout = timeout;
|
|
|
21ab4e |
gf_log (this->name, GF_LOG_DEBUG, "Reconfigued "
|
|
|
21ab4e |
@@ -3879,8 +3879,7 @@ reconfigure (rpc_transport_t *this, dict_t *options)
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
optstr = NULL;
|
|
|
21ab4e |
- if (dict_get_str (this->options, "tcp-window-size",
|
|
|
21ab4e |
- &optstr) == 0) {
|
|
|
21ab4e |
+ if (dict_get_str (options, "tcp-window-size", &optstr) == 0) {
|
|
|
21ab4e |
if (gf_string2uint64 (optstr, &windowsize) != 0) {
|
|
|
21ab4e |
gf_log (this->name, GF_LOG_ERROR,
|
|
|
21ab4e |
"invalid number format: %s", optstr);
|
|
|
21ab4e |
@@ -3890,8 +3889,8 @@ reconfigure (rpc_transport_t *this, dict_t *options)
|
|
|
21ab4e |
|
|
|
21ab4e |
priv->windowsize = (int)windowsize;
|
|
|
21ab4e |
|
|
|
21ab4e |
- if (dict_get (this->options, "non-blocking-io")) {
|
|
|
21ab4e |
- optstr = data_to_str (dict_get (this->options,
|
|
|
21ab4e |
+ if (dict_get (options, "non-blocking-io")) {
|
|
|
21ab4e |
+ optstr = data_to_str (dict_get (options,
|
|
|
21ab4e |
"non-blocking-io"));
|
|
|
21ab4e |
|
|
|
21ab4e |
if (gf_string2boolean (optstr, &tmp_bool) == -1) {
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|