diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2016-10-05 14:59:51 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-01-30 09:13:52 -0500 |
| commit | 59aba1e739726b1a5e7d771b73c2c88d45113c88 (patch) | |
| tree | f7335a5cdfe482ee6c3a39ab3c7988eb17ead407 /xlators/mgmt | |
| parent | 6ebbfb67315ae9abc4058775d3b48d5abfe306d5 (diff) | |
glusterd: daemon restart logic should adhere server side quorum
Just like brick processes, other daemon services should also follow the same
logic of quorum checks to see if a particular service needs to come up if
glusterd is restarted or the incoming friend add/update request is received
(in glusterd_restart_bricks () function)
>Reviewed-on: https://review.gluster.org/15626
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Prashanth Pai <ppai@redhat.com>
Change-Id: I54a1fbdaa1571cc45eed627181b81463fead47a3
BUG: 1417042
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://review.gluster.org/16472
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Reviewed-by: Samikshan Bairagya <samikshan@gmail.com>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'xlators/mgmt')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 21482752c53..cad63a308e5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -4923,10 +4923,6 @@ glusterd_restart_bricks (glusterd_conf_t *conf) cds_list_for_each_entry (volinfo, &conf->volumes, vol_list) { if (volinfo->status != GLUSTERD_STATUS_STARTED) continue; - if (start_svcs == _gf_false) { - start_svcs = _gf_true; - glusterd_svcs_manager (NULL); - } gf_msg_debug (this->name, 0, "starting the volume %s", volinfo->volname); @@ -4949,6 +4945,11 @@ glusterd_restart_bricks (glusterd_conf_t *conf) */ continue; } else { + if (start_svcs == _gf_false) { + start_svcs = _gf_true; + glusterd_svcs_manager (NULL); + } + cds_list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { glusterd_brick_start (volinfo, brickinfo, @@ -4961,8 +4962,8 @@ glusterd_restart_bricks (glusterd_conf_t *conf) cds_list_for_each_entry (volinfo, &snap->volumes, vol_list) { if (volinfo->status != GLUSTERD_STATUS_STARTED) continue; - /* Check the quorum, if quorum is not met, don't start the - bricks + /* Check the quorum, if quorum is not met, don't start + * the bricks */ ret = check_quorum_for_brick_start (volinfo, node_quorum); |