From 381abb5bd2b09a4c40b20ddbe6d385f9a849e384 Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Tue, 10 Mar 2015 19:27:50 +0530 Subject: glusterd: create nfs volfile even when NFS is disabled on all volumes This is required to determine if gluster-nfs daemon needs to be restarted. With http://review.gluster.org/9835 gluster-nfs volfile wouldn't be created if all volumes had nfs disabled before they were started even once. With the existing code, we wouldn't be able to determine if gluster-nfs needs to be restarted or reconfigured without the gluster-nfs volfile. This fix is ensure that we generate the gluster-nfs volfile even if it wouldn't be started, to honour the above requirement. Change-Id: I86c6707870d838b03dd4d14b91b984cb43c33006 BUG: 1199944 Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.org/9851 Reviewed-by: Niels de Vos Reviewed-by: Atin Mukherjee Reviewed-by: Kaushal M Tested-by: Kaushal M Tested-by: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-nfs-svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd') diff --git a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c index 3caabe34a91..49b1b561701 100644 --- a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c @@ -164,7 +164,7 @@ glusterd_nfssvc_manager (glusterd_svc_t *svc, void *data, int flags) { int ret = -1; - if (!glusterd_nfssvc_need_start ()) { + if (glusterd_are_all_volumes_stopped ()) { ret = svc->stop (svc, SIGKILL); } else { -- cgit