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

glusterd: don't start gluster-nfs when NFS is disabled

Browse Source 
Change-Id: Ic4da2a467a95af7108ed67954f44341131b41c7b
BUG: 1199944
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/9835
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Krishnan Parthasarathi 2015-03-09 15:53:53 +05:30 committed by Vijay Bellur
parent 8612553ffe
commit e99f9d3408
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
View File

@ -17,6 +17,28 @@
char *nfs_svc_name = "nfs";
static gf_boolean_t
glusterd_nfssvc_need_start ()
{
glusterd_conf_t *priv = NULL;
gf_boolean_t start = _gf_false;
glusterd_volinfo_t *volinfo = NULL;
priv = THIS->private;
cds_list_for_each_entry (volinfo, &priv->volumes, vol_list) {
if (!glusterd_is_volume_started (volinfo))
continue;
if (dict_get_str_boolean (volinfo->dict, "nfs.disable", 0))
continue;
start = _gf_true;
break;
}
return start;
}
int
glusterd_nfssvc_init (glusterd_svc_t *svc)
{
@ -142,8 +164,9 @@ glusterd_nfssvc_manager (glusterd_svc_t *svc, void *data, int flags)
{
int ret = -1;
if (glusterd_are_all_volumes_stopped ()) {
if (!glusterd_nfssvc_need_start ()) {
ret = svc->stop (svc, SIGKILL);
} else {
ret = glusterd_nfssvc_create_volfile ();
if (ret)
@ -170,7 +193,10 @@ out:
int
glusterd_nfssvc_start (glusterd_svc_t *svc, int flags)
{
return glusterd_svc_start (svc, flags, NULL);
if (glusterd_nfssvc_need_start ())
return glusterd_svc_start (svc, flags, NULL);
return 0;
}
int