diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-03-27 16:09:56 -0400 |
---|---|---|
committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-04-28 14:08:41 +0000 |
commit | 83abcba6b42f94eb5a6495a634d4055362a9d79d (patch) | |
tree | 401e7638258acf9ef4c04af00a0bbfc443b570e3 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
parent | ab88f655e6423f51e2f2fac9265ff4d4f5c3e579 (diff) |
build: conditionally build legacy gNFS server and associated sub-packaging
Plus some additional logic in glusterd to ensure gnfs (glusterfs)
daemons are never started if server/nfs xlator is not installed.
As a service, nfs is still initialized. The glusterfs-gnfs RPM
may be installed or uninstalled independent of anything else,
including on a system where gluster is actively running, so the
existence of the xlator is always tested before trying to start
gnfs.
Change-Id: I56743ad1cb36a84917226d7d26cb9d015d441e66
BUG: 1326219
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/16958
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 32ebcb8b9b2..e00d9a12fa5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -597,11 +597,8 @@ glusterd_volinfo_new (glusterd_volinfo_t **volinfo) new_volinfo->xl = THIS; - new_volinfo->snapd.svc.build = glusterd_snapdsvc_build; - new_volinfo->snapd.svc.build (&(new_volinfo->snapd.svc)); - - new_volinfo->tierd.svc.build = glusterd_tierdsvc_build; - new_volinfo->tierd.svc.build (&(new_volinfo->tierd.svc)); + glusterd_snapdsvc_build (&new_volinfo->snapd.svc); + glusterd_tierdsvc_build (&new_volinfo->tierd.svc); pthread_mutex_init (&new_volinfo->reflock, NULL); *volinfo = glusterd_volinfo_ref (new_volinfo); |