From f82756b4909cebaf533570aec2b05ba55a7dcc95 Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Tue, 3 Mar 2015 17:21:54 +0530 Subject: glusterd: Start quotad before spawning bricks during glusterd restart Change-Id: I66edc1b98b70a494e069df95a6f347634c8f862d BUG: 1198076 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/9791 Reviewed-by: Rajesh Joseph Reviewed-by: Vijaikumar Mallikarjuna Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi --- xlators/mgmt/glusterd/src/glusterd-utils.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'xlators/mgmt') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 84cdfca3049..1e7ebb79c6e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -4701,7 +4701,10 @@ glusterd_restart_bricks (glusterd_conf_t *conf) cds_list_for_each_entry (volinfo, &conf->volumes, vol_list) { if (volinfo->status != GLUSTERD_STATUS_STARTED) continue; - start_svcs = _gf_true; + if (start_svcs == _gf_false) { + start_svcs = _gf_true; + glusterd_svcs_manager (NULL); + } gf_log (this->name, GF_LOG_DEBUG, "starting the volume %s", volinfo->volname); cds_list_for_each_entry (brickinfo, &volinfo->bricks, @@ -4714,6 +4717,10 @@ glusterd_restart_bricks (glusterd_conf_t *conf) cds_list_for_each_entry (volinfo, &snap->volumes, vol_list) { if (volinfo->status != GLUSTERD_STATUS_STARTED) continue; + if (start_svcs == _gf_false) { + start_svcs = _gf_true; + glusterd_svcs_manager (NULL); + } start_svcs = _gf_true; gf_log (this->name, GF_LOG_DEBUG, "starting the snap " "volume %s", volinfo->volname); @@ -4725,9 +4732,6 @@ glusterd_restart_bricks (glusterd_conf_t *conf) } } - if (start_svcs) - glusterd_svcs_manager (NULL); - return ret; } -- cgit