summaryrefslogtreecommitdiffstats
path: root/transport
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-01-08 12:22:45 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-01-12 02:12:49 -0800
commitfb234e86288776386daad21fd6632414376b1cdc (patch)
tree760f474db93343e41beb8766709754163de2719b /transport
parent2674d226f41bf090c8f69c676f22102f877a75c5 (diff)
transport/socket: Enable NODELAY even if no option is set.
Signed-off-by: Vijay Bellur <vijay@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 524 (TCP_NODELAY not set when expected on client) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=524
Diffstat (limited to 'transport')
-rw-r--r--transport/socket/src/socket.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/transport/socket/src/socket.c b/transport/socket/src/socket.c
index afd211e..28baa67 100644
--- a/transport/socket/src/socket.c
+++ b/transport/socket/src/socket.c
@@ -1409,6 +1409,9 @@ socket_init (transport_t *this)
}
optstr = NULL;
+
+ // By default, we enable NODELAY
+ priv->nodelay = 1;
if (dict_get (this->xl->options, "transport.socket.nodelay")) {
optstr = data_to_str (dict_get (this->xl->options,
"transport.socket.nodelay"));
@@ -1419,8 +1422,6 @@ socket_init (transport_t *this)
"boolean options, not taking any action");
tmp_bool = 1;
}
- // By default, we enable NODELAY
- priv->nodelay = 1;
if (!tmp_bool) {
priv->nodelay = 0;
gf_log (this->xl->name, GF_LOG_DEBUG,