summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorAvra Sengupta <asengupt@redhat.com>2015-03-03 17:21:54 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-03-04 06:14:28 -0800
commitf82756b4909cebaf533570aec2b05ba55a7dcc95 (patch)
tree3915dbb57d063c080563574dc576de3a3e9362ea /xlators
parent80ebd3a25ae7dcfcaebec58d7a80b919e2eed5ee (diff)
glusterd: Start quotad before spawning bricks during glusterd restart
Change-Id: I66edc1b98b70a494e069df95a6f347634c8f862d BUG: 1198076 Signed-off-by: Avra Sengupta <asengupt@redhat.com> Reviewed-on: http://review.gluster.org/9791 Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c12
1 files changed, 8 insertions, 4 deletions
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;
}