From fe73f12f6ef2deb402b622747cad5e82b11e57af Mon Sep 17 00:00:00 2001 From: Shyam Date: Sun, 8 Feb 2015 20:08:46 -0500 Subject: 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 Reviewed-on: http://review.gluster.org/9604 Tested-by: Gluster Build System Reviewed-by: Atin Mukherjee Reviewed-by: Krishnan Parthasarathi Reviewed-by: Vijay Bellur --- xlators/protocol/client/src/client.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xlators/protocol/client/src/client.c') 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; -- cgit