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/bugs/rpc | |
| 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/bugs/rpc')
| -rwxr-xr-x | tests/bugs/rpc/bug-1043886.t | 1 | ||||
| -rwxr-xr-x | tests/bugs/rpc/bug-847624.t | 1 | ||||
| -rwxr-xr-x | tests/bugs/rpc/bug-921072.t | 16 |
3 files changed, 13 insertions, 5 deletions
diff --git a/tests/bugs/rpc/bug-1043886.t b/tests/bugs/rpc/bug-1043886.t index e6bd45440b9..b18680289ae 100755 --- a/tests/bugs/rpc/bug-1043886.t +++ b/tests/bugs/rpc/bug-1043886.t @@ -8,6 +8,7 @@ cleanup; TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2}; +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0 ## Mount FUSE with caching disabled diff --git a/tests/bugs/rpc/bug-847624.t b/tests/bugs/rpc/bug-847624.t index 627c47b335f..31a63b56a34 100755 --- a/tests/bugs/rpc/bug-847624.t +++ b/tests/bugs/rpc/bug-847624.t @@ -10,6 +10,7 @@ TEST glusterd TEST pidof glusterd #3 TEST $CLI volume create $V0 $H0:$B0/$V0 +TEST $CLI volume set $V0 nfs.disable off TEST $CLI volume set $V0 nfs.drc on TEST $CLI volume start $V0 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; diff --git a/tests/bugs/rpc/bug-921072.t b/tests/bugs/rpc/bug-921072.t index 46a3442f180..458996b57bf 100755 --- a/tests/bugs/rpc/bug-921072.t +++ b/tests/bugs/rpc/bug-921072.t @@ -11,6 +11,7 @@ TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 $H0:$B0/$V0 +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs $H0:/$V0 $N0 nolock @@ -29,7 +30,8 @@ TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #11 TEST ! mount_nfs localhost:/$V0 $N0 nolock -TEST $CLI volume reset --mode=script $V0 +TEST $CLI volume reset $V0 force +TEST $CLI volume set $V0 nfs.disable off # case 3: reject only localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available @@ -47,7 +49,8 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # NEED TO CHECK BOTH IP AND NAME BASED AUTH. # CASES WITH NFS.ADDR-NAMELOOKUP ON (5-12) -TEST $CLI volume reset --mode=script $V0 +TEST $CLI volume reset $V0 force +TEST $CLI volume set $V0 nfs.disable off TEST $CLI volume set $V0 nfs.addr-namelookup on EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #20 @@ -68,7 +71,8 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 7: reject only localhost -TEST $CLI volume reset --mode=script $V0 +TEST $CLI volume reset $V0 force +TEST $CLI volume set $V0 nfs.disable off TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-reject localhost EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available @@ -84,7 +88,8 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # based on ip addresses: repeat of cases 1-4 # case 9: allow only localhost ip -TEST $CLI volume reset --mode=script $V0 +TEST $CLI volume reset $V0 force +TEST $CLI volume set $V0 nfs.disable off TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available @@ -100,7 +105,8 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 11: reject only localhost ip -TEST $CLI volume reset --mode=script $V0 +TEST $CLI volume reset $V0 force +TEST $CLI volume set $V0 nfs.disable off TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available |