summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorKaushal M <kaushal@gluster.com>2011-08-17 10:44:17 +0530
committerAnand Avati <avati@gluster.com>2011-08-17 02:23:56 -0700
commitadc1ccf1f7ff7b8c25849bfc4a36f3708829a4db (patch)
tree9ea3549f283c728dcc76428f13dbef18876678bf /xlators
parent276142d543f6129623e40e7c93a23353c1f4eac3 (diff)
glusterd: fix for volume stop causing inconsistent volume status
This fixes problem caused by race between glusterd and glusterfsd occuring when they try to unlink pidfile during volume stop, which led to the volume being stopped, but the status of the volume remained in started state. Change-Id: Ibf88b61dc66be4ddff9050a0359636675de558a2 BUG: 3147 Reviewed-on: http://review.gluster.com/246 Reviewed-by: Vijay Bellur <vijay@gluster.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 1884c21..a84f72b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -885,6 +885,9 @@ glusterd_service_stop (const char *service, char *pidfile, int sig,
if (ret && (ENOENT != errno)) {
gf_log ("", GF_LOG_ERROR, "Unable to "
"unlink stale pidfile: %s", pidfile);
+ } else if (ret && (ENOENT == errno)){
+ ret = 0;
+ gf_log ("", GF_LOG_INFO, "Brick already stopped");
}
goto out;
}
@@ -1222,7 +1225,7 @@ glusterd_volume_stop_glusterfs (glusterd_volinfo_t *volinfo,
ret = glusterd_service_stop ("brick", pidfile, SIGTERM, _gf_false);
if (ret == 0) {
glusterd_set_brick_status (brickinfo, GF_BRICK_STOPPED);
- ret = glusterd_brick_unlink_socket_file (volinfo, brickinfo);
+ (void) glusterd_brick_unlink_socket_file (volinfo, brickinfo);
}
return ret;
}