From 362762b35635b6fb5cbd7c394c63c08973ec3993 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Mon, 2 Jul 2018 16:47:30 +0530 Subject: glusterd: start the services after all the bricks are up glusterd_svcs_manager () should be called post starting all the volumes at one go. Change-Id: I838cc50c29f3930a483aa9671958cdc186904030 Fixes: bz#1597247 Signed-off-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 07987418a7f..de5933894e0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -6179,10 +6179,7 @@ glusterd_restart_bricks (void *opaque) */ continue; } else { - if (start_svcs == _gf_false) { - start_svcs = _gf_true; - glusterd_svcs_manager (NULL); - } + start_svcs = _gf_true; cds_list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { if (!brickinfo->start_triggered) { @@ -6225,10 +6222,6 @@ glusterd_restart_bricks (void *opaque) "quorum is not met", volinfo->volname); continue; } - if (start_svcs == _gf_false) { - start_svcs = _gf_true; - glusterd_svcs_manager (volinfo); - } start_svcs = _gf_true; gf_msg_debug (this->name, 0, "starting the snap " "volume %s", volinfo->volname); @@ -6255,9 +6248,12 @@ glusterd_restart_bricks (void *opaque) volinfo->volname); goto out; } - } } + if (start_svcs == _gf_true) { + glusterd_svcs_manager (NULL); + } + ret = 0; out: -- cgit