summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorMilind Changire <mchangir@redhat.com>2017-04-11 12:30:06 +0530
committerRaghavendra G <rgowdapp@redhat.com>2017-04-12 05:44:01 -0400
commit6b8df081b46ac4f485c86a5052fc30472e74bfbb (patch)
treef472b4d48d2f70a274b019f695db09ee6bde4f40 /xlators/mgmt
parent1612355327fa5f86078b9dbcf7a38e4e0c63e205 (diff)
rpc: add options to manage socket keepalive lifespan
Problem: Default values for handling socket timeouts for brick responses are insufficient for aggressive applications such as databases. Solution: Add 1:1 gluster options for keepalive, keepalive-idle, keepalive-interval and keepalive-timeout as per the socket level options available as per tcp(7) man page. Default values for options are NOT agressive and continue to be values which result in default timeout when only the keep alive option is turned on. These options are Linux specific and will not be applicable to the *BSDs. Change-Id: I2a08ecd949ca8ceb3e090d336ad634341e2dbf14 BUG: 1426059 Signed-off-by: Milind Changire <mchangir@redhat.com> Reviewed-on: https://review.gluster.org/16731 Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c56
1 files changed, 55 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index ca32552fb0d..e5818a1aa15 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1680,6 +1680,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
{ .key = "network.ping-timeout",
.voltype = "protocol/client",
.op_version = 1,
+ .value = "42",
.flags = OPT_FLAG_CLIENT_OPT
},
{ .key = "network.tcp-window-size",
@@ -1723,12 +1724,40 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "protocol/client",
.op_version = GD_OP_VERSION_3_7_0,
},
+ { .key = "client.tcp-user-timeout",
+ .voltype = "protocol/client",
+ .option = "transport.tcp-user-timeout",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "0", /* 0 - implies "use system default" */
+ .flags = OPT_FLAG_CLIENT_OPT
+ },
+ { .key = "client.keepalive-time",
+ .voltype = "protocol/client",
+ .option = "transport.socket.keepalive-time",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "20",
+ .flags = OPT_FLAG_CLIENT_OPT
+ },
+ { .key = "client.keepalive-interval",
+ .voltype = "protocol/client",
+ .option = "transport.socket.keepalive-interval",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "2",
+ .flags = OPT_FLAG_CLIENT_OPT
+ },
+ { .key = "client.keepalive-count",
+ .voltype = "protocol/client",
+ .option = "transport.socket.keepalive-count",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "9",
+ .flags = OPT_FLAG_CLIENT_OPT
+ },
/* Server xlator options */
{ .key = "network.ping-timeout",
.voltype = "protocol/server",
- .option = "transport.tcp-user-timeout",
.op_version = GD_OP_VERSION_3_7_0,
+ .value = "42",
},
{ .key = "network.tcp-window-size",
.voltype = "protocol/server",
@@ -1754,6 +1783,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "protocol/server",
.option = "transport.socket.keepalive",
.type = NO_DOC,
+ .value = "1",
.op_version = 1
},
{ .key = "server.allow-insecure",
@@ -1841,6 +1871,30 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "protocol/server",
.op_version = GD_OP_VERSION_3_7_0,
},
+ { .key = "server.tcp-user-timeout",
+ .voltype = "protocol/server",
+ .option = "transport.tcp-user-timeout",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "0", /* 0 - implies "use system default" */
+ },
+ { .key = "server.keepalive-time",
+ .voltype = "protocol/server",
+ .option = "transport.socket.keepalive-time",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "20",
+ },
+ { .key = "server.keepalive-interval",
+ .voltype = "protocol/server",
+ .option = "transport.socket.keepalive-interval",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "2",
+ },
+ { .key = "server.keepalive-count",
+ .voltype = "protocol/server",
+ .option = "transport.socket.keepalive-count",
+ .op_version = GD_OP_VERSION_3_10_2,
+ .value = "9",
+ },
/* Generic transport options */
{ .key = SSL_OWN_CERT_OPT,