andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: stop daemon services upon peer detach correctly

Browse Source 
Problem:
Currently glusterd is stopping all the daemons service upon peer detach.
If user have multi node cluster and if user want to detach any node
from the cluster, and detached node having stand alone volume then upon
detaching glusterd stopping all the daemon's of the detached node,
which is having running volume.

Fix:
Upon peer detach it should do peer detach cleanup properly and it should
stop only those daemon on the node on which it require.

Change-Id: I98b8099166f82e235ded6d02261f59a6511a003b
BUG: 1287455
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/12838
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Gaurav Kumar Garg 2015-12-01 19:14:08 +05:30 committed by Atin Mukherjee
parent 93f31189ce
commit cae9512d60
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xlators/mgmt/glusterd/src/glusterd-sm.c
View File

@ -609,17 +609,6 @@ glusterd_peer_detach_cleanup (glusterd_conf_t *priv)
cds_list_for_each_entry_safe (volinfo, tmp_volinfo, &priv->volumes,
vol_list) {
/* Stop snapd daemon service if snapd daemon is running*/
if (!volinfo->is_snap_volume) {
svc = &(volinfo->snapd.svc);
ret = svc->stop (svc, SIGTERM);
if (ret) {
gf_msg (THIS->name, GF_LOG_ERROR, 0,
GD_MSG_SVC_STOP_FAIL, "Failed to "
"stop snapd daemon service.");
}
}
/* The peer detach checks make sure that, at this point in the
* detach process, there are only volumes contained completely
* within or completely outside the detached peer.
@ -632,6 +621,17 @@ glusterd_peer_detach_cleanup (glusterd_conf_t *priv)
GD_MSG_STALE_VOL_DELETE_INFO,
"Deleting stale volume %s", volinfo->volname);
/*Stop snapd daemon service if snapd daemon is running*/
if (!volinfo->is_snap_volume) {
svc = &(volinfo->snapd.svc);
ret = svc->stop (svc, SIGTERM);
if (ret) {
gf_msg (THIS->name, GF_LOG_ERROR, 0,
GD_MSG_SVC_STOP_FAIL, "Failed "
"to stop snapd daemon service");
}
}
ret = glusterd_cleanup_snaps_for_volume (volinfo);
if (ret) {
gf_msg (THIS->name, GF_LOG_ERROR, 0,
@ -649,12 +649,12 @@ glusterd_peer_detach_cleanup (glusterd_conf_t *priv)
}
}
/* Stop all daemon services of Detaching node once peer detached */
ret = glusterd_svcs_stop ();
/*Reconfigure all daemon services upon peer detach*/
ret = glusterd_svcs_reconfigure ();
if (ret) {
gf_msg (THIS->name, GF_LOG_ERROR, 0,
GD_MSG_SVC_STOP_FAIL,
"Failed to stop all daemon services.");
"Failed to reconfigure all daemon services.");
}
}

31
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -6869,10 +6869,11 @@ glusterd_friend_contains_vol_bricks (glusterd_volinfo_t *volinfo,
int
glusterd_friend_remove_cleanup_vols (uuid_t uuid)
{
int ret = -1;
glusterd_conf_t *priv = NULL;
glusterd_volinfo_t *volinfo = NULL;
glusterd_volinfo_t *tmp_volinfo = NULL;
int ret = -1;
glusterd_conf_t *priv = NULL;
glusterd_svc_t *svc = NULL;
glusterd_volinfo_t *volinfo = NULL;
glusterd_volinfo_t *tmp_volinfo = NULL;
priv = THIS->private;
GF_ASSERT (priv);
@ -6891,6 +6892,28 @@ glusterd_friend_remove_cleanup_vols (uuid_t uuid)
goto out;
}
}
if (!glusterd_friend_contains_vol_bricks (volinfo,
MY_UUID)) {
/*Stop snapd daemon service if snapd daemon is running*/
if (!volinfo->is_snap_volume) {
svc = &(volinfo->snapd.svc);
ret = svc->stop (svc, SIGTERM);
if (ret) {
gf_msg (THIS->name, GF_LOG_ERROR, 0,
GD_MSG_SVC_STOP_FAIL, "Failed "
"to stop snapd daemon service");
}
}
}
}
/* Reconfigure all daemon services upon peer detach */
ret = glusterd_svcs_reconfigure ();
if (ret) {
gf_msg (THIS->name, GF_LOG_ERROR, 0,
GD_MSG_SVC_STOP_FAIL,
"Failed to reconfigure all daemon services.");
}
ret = 0;
out: