diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-03-15 06:16:31 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-04-27 00:59:30 -0700 |
| commit | a4f84d786b596387aa0d659fb5cc8a933c95c01b (patch) | |
| tree | 85e0f319cf0405a632c5a268dfb25407c054dba8 /tests/basic/mount-nfs-auth.t | |
| parent | 3c35329feb4dd479c9e4856ee27fa4b12c708db2 (diff) | |
glusterd: default value of nfs.disable, change from false to true
Next step in eventual deprecation of glusterfs nfs server in favor
of ganesha.nfsd.
Also replace several open-coded strings with constant.
Change-Id: If52f5e880191a14fd38e69b70a32b0300dd93a50
BUG: 1092414
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/13738
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'tests/basic/mount-nfs-auth.t')
| -rwxr-xr-x | tests/basic/mount-nfs-auth.t | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t index 6ecac5b469a..9df5cb45c3b 100755 --- a/tests/basic/mount-nfs-auth.t +++ b/tests/basic/mount-nfs-auth.t @@ -132,9 +132,16 @@ function stat_nfs () { # Restarts the NFS server function restart_nfs () { - # disabling nfs acces for a volume requires a restart - $CLI volume set patchy nfs.disable true - $CLI volume reset patchy nfs.disable + local NFS_PID=$(cat ${GLUSTERD_WORKDIR}/nfs/run/nfs.pid) + + # kill the NFS-server if it is running + while ps -q ${NFS_PID} 2>&1 > /dev/null; do + kill ${NFS_PID} + sleep 0.5 + done + + # start-force starts the NFS-server again + $CLI vol start patchy force } setup_cluster |