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/nfs | |
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/nfs')
-rwxr-xr-x | tests/bugs/nfs/bug-1053579.t | 1 | ||||
-rw-r--r-- | tests/bugs/nfs/bug-1116503.t | 1 | ||||
-rw-r--r-- | tests/bugs/nfs/bug-1143880-fix-gNFSd-auth-crash.t | 1 | ||||
-rw-r--r-- | tests/bugs/nfs/bug-1157223-symlink-mounting.t | 2 | ||||
-rw-r--r-- | tests/bugs/nfs/bug-1161092-nfs-acls.t | 1 | ||||
-rwxr-xr-x | tests/bugs/nfs/bug-1166862.t | 1 | ||||
-rw-r--r-- | tests/bugs/nfs/bug-1210338.t | 1 | ||||
-rwxr-xr-x | tests/bugs/nfs/bug-847622.t | 1 | ||||
-rwxr-xr-x | tests/bugs/nfs/bug-877885.t | 1 | ||||
-rwxr-xr-x | tests/bugs/nfs/bug-904065.t | 1 | ||||
-rwxr-xr-x | tests/bugs/nfs/bug-915280.t | 1 | ||||
-rwxr-xr-x | tests/bugs/nfs/bug-974972.t | 1 | ||||
-rw-r--r-- | tests/bugs/nfs/socket-as-fifo.t | 1 |
13 files changed, 13 insertions, 1 deletions
diff --git a/tests/bugs/nfs/bug-1053579.t b/tests/bugs/nfs/bug-1053579.t index 81e786d2ec6..f616eb2baa5 100755 --- a/tests/bugs/nfs/bug-1053579.t +++ b/tests/bugs/nfs/bug-1053579.t @@ -42,6 +42,7 @@ TEST useradd -o -M -u ${NEW_UID} -g ${NEW_GID} -G ${NEW_USER}-${NEW_GIDS} ${NEW_ TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 $H0:$B0/${V0}1 +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume set $V0 nfs.server-aux-gids on TEST $CLI volume start $V0 diff --git a/tests/bugs/nfs/bug-1116503.t b/tests/bugs/nfs/bug-1116503.t index 5527f768b45..c9ed840ec92 100644 --- a/tests/bugs/nfs/bug-1116503.t +++ b/tests/bugs/nfs/bug-1116503.t @@ -13,6 +13,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 set $V0 nfs.mount-udp on TEST $CLI volume start $V0 diff --git a/tests/bugs/nfs/bug-1143880-fix-gNFSd-auth-crash.t b/tests/bugs/nfs/bug-1143880-fix-gNFSd-auth-crash.t index 1a9270286fb..b194b3744b4 100644 --- a/tests/bugs/nfs/bug-1143880-fix-gNFSd-auth-crash.t +++ b/tests/bugs/nfs/bug-1143880-fix-gNFSd-auth-crash.t @@ -7,6 +7,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 set $V0 performance.open-behind off TEST $CLI volume start $V0 diff --git a/tests/bugs/nfs/bug-1157223-symlink-mounting.t b/tests/bugs/nfs/bug-1157223-symlink-mounting.t index 469b221f5b3..740d638193d 100644 --- a/tests/bugs/nfs/bug-1157223-symlink-mounting.t +++ b/tests/bugs/nfs/bug-1157223-symlink-mounting.t @@ -11,7 +11,7 @@ TEST pidof glusterd TEST $CLI volume info; TEST $CLI volume create $V0 $H0:$B0/$V0 - +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; ## Wait for volume to register with rpc.mountd diff --git a/tests/bugs/nfs/bug-1161092-nfs-acls.t b/tests/bugs/nfs/bug-1161092-nfs-acls.t index ed7761db3e3..1304ad905bf 100644 --- a/tests/bugs/nfs/bug-1161092-nfs-acls.t +++ b/tests/bugs/nfs/bug-1161092-nfs-acls.t @@ -11,6 +11,7 @@ TEST $CLI volume info TEST $CLI volume create $V0 $H0:$B0/brick1; EXPECT 'Created' volinfo_field $V0 'Status'; +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; diff --git a/tests/bugs/nfs/bug-1166862.t b/tests/bugs/nfs/bug-1166862.t index c8f63d50b0c..f986fe36ab7 100755 --- a/tests/bugs/nfs/bug-1166862.t +++ b/tests/bugs/nfs/bug-1166862.t @@ -28,6 +28,7 @@ TEST pidof glusterd TEST $CLI volume create $V0 $H0:$B0/brick1 EXPECT 'Created' volinfo_field $V0 'Status' +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status' diff --git a/tests/bugs/nfs/bug-1210338.t b/tests/bugs/nfs/bug-1210338.t index cdac24e3e8e..4232b9d8748 100644 --- a/tests/bugs/nfs/bug-1210338.t +++ b/tests/bugs/nfs/bug-1210338.t @@ -13,6 +13,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 diff --git a/tests/bugs/nfs/bug-847622.t b/tests/bugs/nfs/bug-847622.t index 22167e87e50..3b836745a07 100755 --- a/tests/bugs/nfs/bug-847622.t +++ b/tests/bugs/nfs/bug-847622.t @@ -19,6 +19,7 @@ cleanup; TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 $H0:$B0/brick0 +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; diff --git a/tests/bugs/nfs/bug-877885.t b/tests/bugs/nfs/bug-877885.t index 47eb396b532..a47893d7fcb 100755 --- a/tests/bugs/nfs/bug-877885.t +++ b/tests/bugs/nfs/bug-877885.t @@ -9,6 +9,7 @@ cleanup; TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/brick0 $H0:$B0/brick1 +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0 ## Mount FUSE with caching disabled diff --git a/tests/bugs/nfs/bug-904065.t b/tests/bugs/nfs/bug-904065.t index ff6797bcbec..0becb756da4 100755 --- a/tests/bugs/nfs/bug-904065.t +++ b/tests/bugs/nfs/bug-904065.t @@ -30,6 +30,7 @@ TEST pidof glusterd TEST $CLI volume create $V0 $H0:$B0/brick1 EXPECT 'Created' volinfo_field $V0 'Status' +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status' diff --git a/tests/bugs/nfs/bug-915280.t b/tests/bugs/nfs/bug-915280.t index 72bdf2c0d9c..d70c36f0a53 100755 --- a/tests/bugs/nfs/bug-915280.t +++ b/tests/bugs/nfs/bug-915280.t @@ -19,6 +19,7 @@ function volinfo_field() TEST $CLI volume create $V0 $H0:$B0/brick1 $H0:$B0/brick2; EXPECT 'Created' volinfo_field $V0 'Status'; +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; diff --git a/tests/bugs/nfs/bug-974972.t b/tests/bugs/nfs/bug-974972.t index 9ed19915a67..d05e7df1a9f 100755 --- a/tests/bugs/nfs/bug-974972.t +++ b/tests/bugs/nfs/bug-974972.t @@ -11,6 +11,7 @@ TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} TEST $CLI volume set $V0 self-heal-daemon off +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 diff --git a/tests/bugs/nfs/socket-as-fifo.t b/tests/bugs/nfs/socket-as-fifo.t index 94a800a2ceb..ca5f2af6f2b 100644 --- a/tests/bugs/nfs/socket-as-fifo.t +++ b/tests/bugs/nfs/socket-as-fifo.t @@ -10,6 +10,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 |