summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2019-12-26 14:22:56 +0300
committerAmar Tumballi <amarts@gmail.com>2019-12-27 17:01:33 +0000
commit9937b9857472c346c071c3850b032ae9237721e5 (patch)
tree7939c272f03e32c5e5aec4f9c9456e5a0e5afc0f /rpc
parentf2a86ddf9331cd7387c44ba03307adac43575fc4 (diff)
socket: fix typos and drop unused members/options
Consistently fix 'configued' -> 'configured' typo, remove useless members from 'socket_private_t' and unused 'transport.socket.lowlat' option. Adjust tests as well. Change-Id: I285be196457763aec16b184acd26b90623074dec Updates: bz#1193929 Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-transport/socket/src/socket.c15
-rw-r--r--rpc/rpc-transport/socket/src/socket.h3
2 files changed, 7 insertions, 11 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 71f9270..483b6a3 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -4092,33 +4092,33 @@ reconfigure(rpc_transport_t *this, dict_t *options)
&(priv->timeout)) != 0)
priv->timeout = GF_NETWORK_TIMEOUT;
gf_log(this->name, GF_LOG_DEBUG,
- "Reconfigued transport.tcp-user-timeout=%d", priv->timeout);
+ "Reconfigured transport.tcp-user-timeout=%d", priv->timeout);
if (dict_get_uint32(options, "transport.listen-backlog", &backlog) == 0) {
priv->backlog = backlog;
gf_log(this->name, GF_LOG_DEBUG,
- "Reconfigued transport.listen-backlog=%d", priv->backlog);
+ "Reconfigured transport.listen-backlog=%d", priv->backlog);
}
if (dict_get_int32_sizen(options, "transport.socket.keepalive-time",
&(priv->keepaliveidle)) != 0)
priv->keepaliveidle = GF_KEEPALIVE_TIME;
gf_log(this->name, GF_LOG_DEBUG,
- "Reconfigued transport.socket.keepalive-time=%d",
+ "Reconfigured transport.socket.keepalive-time=%d",
priv->keepaliveidle);
if (dict_get_int32_sizen(options, "transport.socket.keepalive-interval",
&(priv->keepaliveintvl)) != 0)
priv->keepaliveintvl = GF_KEEPALIVE_INTERVAL;
gf_log(this->name, GF_LOG_DEBUG,
- "Reconfigued transport.socket.keepalive-interval=%d",
+ "Reconfigured transport.socket.keepalive-interval=%d",
priv->keepaliveintvl);
if (dict_get_int32_sizen(options, "transport.socket.keepalive-count",
&(priv->keepalivecnt)) != 0)
priv->keepalivecnt = GF_KEEPALIVE_COUNT;
gf_log(this->name, GF_LOG_DEBUG,
- "Reconfigued transport.socket.keepalive-count=%d",
+ "Reconfigured transport.socket.keepalive-count=%d",
priv->keepalivecnt);
optstr = NULL;
@@ -4611,7 +4611,7 @@ socket_init(rpc_transport_t *this)
if (dict_get_int32_sizen(this->options, "transport.tcp-user-timeout",
&(priv->timeout)) != 0)
priv->timeout = GF_NETWORK_TIMEOUT;
- gf_log(this->name, GF_LOG_DEBUG, "Configued transport.tcp-user-timeout=%d",
+ gf_log(this->name, GF_LOG_DEBUG, "Configured transport.tcp-user-timeout=%d",
priv->timeout);
if (dict_get_int32_sizen(this->options, "transport.socket.keepalive-time",
@@ -4628,7 +4628,7 @@ socket_init(rpc_transport_t *this)
if (dict_get_int32_sizen(this->options, "transport.socket.keepalive-count",
&(priv->keepalivecnt)) != 0)
priv->keepalivecnt = GF_KEEPALIVE_COUNT;
- gf_log(this->name, GF_LOG_DEBUG, "Reconfigued transport.keepalivecnt=%d",
+ gf_log(this->name, GF_LOG_DEBUG, "Reconfigured transport.keepalivecnt=%d",
priv->keepalivecnt);
if (dict_get_uint32(this->options, "transport.listen-backlog",
@@ -4777,7 +4777,6 @@ struct volume_options options[] = {
{.key = {"transport.socket.nodelay"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "1"},
- {.key = {"transport.socket.lowlat"}, .type = GF_OPTION_TYPE_BOOL},
{.key = {"transport.socket.keepalive"},
.type = GF_OPTION_TYPE_BOOL,
.op_version = {1},
diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h
index 63bd24b..689d4aa 100644
--- a/rpc/rpc-transport/socket/src/socket.h
+++ b/rpc/rpc-transport/socket/src/socket.h
@@ -200,7 +200,6 @@ typedef struct {
pthread_mutex_t out_lock;
pthread_mutex_t cond_lock;
pthread_cond_t cond;
- pthread_t thread;
int windowsize;
int keepalive;
int keepaliveidle;
@@ -236,7 +235,6 @@ typedef struct {
char *ssl_private_key;
char *ssl_ca_list;
char *crl_path;
- int pipe[2];
struct gf_sock_incoming incoming;
mgmt_ssl_t srvr_ssl;
/* -1 = not connected. 0 = in progress. 1 = connected */
@@ -247,7 +245,6 @@ typedef struct {
char bio;
char connect_finish_log;
char submit_log;
- char lowlat;
char nodelay;
gf_boolean_t read_fail_log;
gf_boolean_t ssl_enabled; /* outbound I/O */