summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorShyam <srangana@redhat.com>2015-02-08 20:08:46 -0500
committerVijay Bellur <vbellur@redhat.com>2015-02-09 07:17:23 -0800
commitfe73f12f6ef2deb402b622747cad5e82b11e57af (patch)
tree09bb70b373339943f798320739e81a8a0061d701 /xlators/protocol
parent1353aeadcd080c356a4c404dbfb10ff3f23ab4cf (diff)
epoll: Initialize server/client xlator event-threads correctly
In the patch http://review.gluster.org/#/c/9488/ the default configuration for server and client protocol xlators, had event-threads set to 2, but the default conf was not updated with these values, hence the default threads remained at 1. This patch corrects the same by first updating the thread count from the default configuration before updating it with the latest. Change-Id: I3ce54053a59ca796b004fa5462e43ca19a5f2915 BUG: 1104462 Signed-off-by: Shyam <srangana@redhat.com> Reviewed-on: http://review.gluster.org/9604 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client.c5
-rw-r--r--xlators/protocol/server/src/server.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 00d88d6e7a1..32952b49fbb 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -2677,9 +2677,8 @@ init (xlator_t *this)
conf->grace_timer = NULL;
conf->grace_timer_needed = _gf_true;
- /* Set event threads to a default */
- conf->event_threads = STARTING_EVENT_THREADS;
-
+ /* Set event threads to the configured default */
+ GF_OPTION_INIT("event-threads", conf->event_threads, int32, out);
ret = client_check_event_threads (this, this->options, conf);
if (ret)
goto out;
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 92113c7c28b..e132cf33f85 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -871,9 +871,8 @@ init (xlator_t *this)
INIT_LIST_HEAD (&conf->xprt_list);
pthread_mutex_init (&conf->mutex, NULL);
- /* Set event threads to a default */
- conf->event_threads = STARTING_EVENT_THREADS;
-
+ /* Set event threads to the configured default */
+ GF_OPTION_INIT("event-threads", conf->event_threads, int32, out);
ret = server_check_event_threads (this, this->options, conf);
if (ret)
goto out;