summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2011-03-30 23:43:41 +0000
committerVijay Bellur <vijay@dev.gluster.com>2011-03-31 04:19:53 -0700
commit5f6e7aecdb4dba8b181e90be99eb21ad40129315 (patch)
tree14ac7386fbbbdedeb97619fb6515b3500d9f843b
parent0cccbefebfd2e95dbbf7f078f5e45267c60d48ed (diff)
mgmt/glusterd: Mark the brick stopped when kill -SIGTERM is done
Signed-off-by: Pranith Kumar K <pranithk@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2621 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2621
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c1
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 4696b6ca343..ea4f5d63a79 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -527,6 +527,7 @@ glusterd_op_stage_stop_volume (dict_t *dict, char **op_errstr)
gf_log ("", GF_LOG_ERROR, "Volume %s "
"has not been started", volname);
*op_errstr = gf_strdup (msg);
+ ret = -1;
goto out;
}
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index bd32380e262..c4e555e8a3f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -1159,6 +1159,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);
}
return ret;