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>

55 files changed, 91 insertions, 24 deletions

diff --git a/tests/basic/afr/arbiter-mount.t b/tests/basic/afr/arbiter-mount.t
index 7276285202..587e808863 100644
--- a/tests/basic/afr/arbiter-mount.t
+++ b/tests/basic/afr/arbiter-mount.t
@@ -12,6 +12,7 @@ TEST glusterd;
 TEST pidof glusterd
 
 TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/${V0}{0,1,2}
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 EXPECT 'Started' volinfo_field $V0 'Status'
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
diff --git a/tests/basic/ec/nfs.t b/tests/basic/ec/nfs.t
index 16e88c1460..f0bdff93d5 100755
--- a/tests/basic/ec/nfs.t
+++ b/tests/basic/ec/nfs.t
@@ -9,6 +9,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 redundancy 2 $H0:$B0/${V0}{0..5}
 EXPECT "Created" volinfo_field $V0 'Status'
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Started" volinfo_field $V0 'Status'
 
diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t
index 6ecac5b469..9df5cb45c3 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
diff --git a/tests/basic/mount.t b/tests/basic/mount.t
index 47d0efe390..52e760d048 100755
--- a/tests/basic/mount.t
+++ b/tests/basic/mount.t
@@ -12,6 +12,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume set $V0 nfs.disable false
 
 function volinfo_field()
 {
diff --git a/tests/basic/nufa.t b/tests/basic/nufa.t
index ca4054a354..1d74d376b7 100644
--- a/tests/basic/nufa.t
+++ b/tests/basic/nufa.t
@@ -11,6 +11,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume set $V0 nfs.disable false
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
diff --git a/tests/basic/quota-anon-fd-nfs.t b/tests/basic/quota-anon-fd-nfs.t
index e2cce0b69c..c6b01553b0 100755
--- a/tests/basic/quota-anon-fd-nfs.t
+++ b/tests/basic/quota-anon-fd-nfs.t
@@ -18,6 +18,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
 
 
 # The test makes use of inode-lru-limit to hit a scenario, where we
diff --git a/tests/basic/quota-nfs.t b/tests/basic/quota-nfs.t
index 16d5aa6a90..74fde400bd 100755
--- a/tests/basic/quota-nfs.t
+++ b/tests/basic/quota-nfs.t
@@ -15,6 +15,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 set $V0 network.inode-lru-limit 1
 TEST $CLI volume set $V0 performance.nfs.write-behind off
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index 887fbfc32b..5a03fa2568 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -24,6 +24,7 @@ EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
 EXPECT '4' brick_count $V0
 
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0;
 EXPECT 'Started' volinfo_field $V0 'Status';
 
diff --git a/tests/basic/stats-dump.t b/tests/basic/stats-dump.t
index 0a680e44e5..7da6e0605a 100644
--- a/tests/basic/stats-dump.t
+++ b/tests/basic/stats-dump.t
@@ -14,7 +14,7 @@ TEST $CLI volume set $V0 diagnostics.count-fop-hits on
 TEST $CLI volume set $V0 diagnostics.stats-dump-interval 1
 TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume start $V0
-sleep 1
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
 TEST mount_nfs $H0:/$V0 $N0 nolock,soft,intr
 
diff --git a/tests/basic/uss.t b/tests/basic/uss.t
index 55fab660aa..6cfc030389 100644
--- a/tests/basic/uss.t
+++ b/tests/basic/uss.t
@@ -34,6 +34,8 @@ TEST glusterd;
 TEST pidof glusterd;
 
 TEST $CLI volume create $V0 $H0:$L1 $H0:$L2 $H0:$L3;
+TEST $CLI volume set $V0 nfs.disable false
+
 
 TEST $CLI volume start $V0;
 
diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t
index 7d1b8326e3..f87b0a93ed 100644
--- a/tests/basic/volume-status.t
+++ b/tests/basic/volume-status.t
@@ -11,6 +11,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume set $V0 nfs.disable false
 
 TEST $CLI volume start $V0;
 
diff --git a/tests/bitrot/br-stub.t b/tests/bitrot/br-stub.t
index eb0c55caa3..56b0960e07 100644
--- a/tests/bitrot/br-stub.t
+++ b/tests/bitrot/br-stub.t
@@ -17,6 +17,7 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}1 $H0:$B0/${V0}2;
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
 EXPECT '2' brick_count $V0
+TEST $CLI volume set $V0 nfs.disable false
 
 ## Turn off write-behind (write-behind clubs writes together)
 TEST $CLI volume set $V0 performance.write-behind off
diff --git a/tests/bitrot/bug-1244613.t b/tests/bitrot/bug-1244613.t
index 000a1d358e..a1812e61f6 100644
--- a/tests/bitrot/bug-1244613.t
+++ b/tests/bitrot/bug-1244613.t
@@ -14,7 +14,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
 
 # The test makes use of inode-lru-limit to hit a scenario, where we
 # find an inode whose ancestry is not there. Following is the
diff --git a/tests/bugs/access-control/bug-958691.t b/tests/bugs/access-control/bug-958691.t
index 9db858da2d..6c45b47b16 100644
--- a/tests/bugs/access-control/bug-958691.t
+++ b/tests/bugs/access-control/bug-958691.t
@@ -8,6 +8,7 @@ cleanup;
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0;
 
 TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
diff --git a/tests/bugs/bug-1110262.t b/tests/bugs/bug-1110262.t
index b6051935b7..9c6e4f973a 100644
--- a/tests/bugs/bug-1110262.t
+++ b/tests/bugs/bug-1110262.t
@@ -12,6 +12,7 @@ TEST $CLI volume info;
 
 ## Lets create volume
 TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
+TEST $CLI volume set $V0 nfs.disable false
 
 ## Verify volume is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
diff --git a/tests/bugs/core/bug-927616.t b/tests/bugs/core/bug-927616.t
index 811e88f952..6bb6474318 100755
--- a/tests/bugs/core/bug-927616.t
+++ b/tests/bugs/core/bug-927616.t
@@ -9,6 +9,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
 TEST $CLI volume set $V0 performance.open-behind off;
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 
 ## Mount FUSE with caching disabled
diff --git a/tests/bugs/disperse/bug-1187474.t b/tests/bugs/disperse/bug-1187474.t
index dce0100de5..fb4b2082f8 100644
--- a/tests/bugs/disperse/bug-1187474.t
+++ b/tests/bugs/disperse/bug-1187474.t
@@ -22,6 +22,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 redundancy 2 $H0:$B0/${V0}{0..5}
 EXPECT "Created" volinfo_field $V0 'Status'
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Started" volinfo_field $V0 'Status'
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
diff --git a/tests/bugs/distribute/bug-1125824.t b/tests/bugs/distribute/bug-1125824.t
index a944b360db..3bafbf31fe 100755
--- a/tests/bugs/distribute/bug-1125824.t
+++ b/tests/bugs/distribute/bug-1125824.t
@@ -54,6 +54,7 @@ EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
 EXPECT '4' brick_count $V0
 
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0;
 EXPECT 'Started' volinfo_field $V0 'Status';
 
diff --git a/tests/bugs/distribute/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t
index 572338a225..44a234c60d 100755
--- a/tests/bugs/distribute/bug-1161156.t
+++ b/tests/bugs/distribute/bug-1161156.t
@@ -17,6 +17,7 @@ TEST $CLI volume info;
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6};
 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/distribute/bug-1190734.t b/tests/bugs/distribute/bug-1190734.t
index ae34ec8472..d48d74d2c3 100644
--- a/tests/bugs/distribute/bug-1190734.t
+++ b/tests/bugs/distribute/bug-1190734.t
@@ -62,6 +62,7 @@ TEST pidof glusterd
 
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1 \
     $H0:$B0/${V0}2 $H0:$B0/${V0}3 $H0:$B0/${V0}4 $H0:$B0/${V0}5
+TEST $CLI volume set $V0 nfs.disable false
 
 # ------- test 1: AFR, fuse + remove bricks
 
@@ -77,6 +78,7 @@ reset $M0
 
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1 \
     $H0:$B0/${V0}2 $H0:$B0/${V0}3 $H0:$B0/${V0}4 $H0:$B0/${V0}5
+TEST $CLI volume set $V0 nfs.disable false
 
 TEST start_mount_nfs test2
 EXPECT_WITHIN $FILE_COUNT_TIME $FILE_COUNT get_file_count $N0/test2
diff --git a/tests/bugs/fuse/bug-858215.t b/tests/bugs/fuse/bug-858215.t
index b33b8d4971..c8613efb72 100755
--- a/tests/bugs/fuse/bug-858215.t
+++ b/tests/bugs/fuse/bug-858215.t
@@ -11,6 +11,7 @@ TEST pidof glusterd;
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume set $V0 nfs.disable off
 
 function volinfo_field()
 {
diff --git a/tests/bugs/fuse/many-groups-for-acl.t b/tests/bugs/fuse/many-groups-for-acl.t
index d83fe12644..d959f750ee 100755
--- a/tests/bugs/fuse/many-groups-for-acl.t
+++ b/tests/bugs/fuse/many-groups-for-acl.t
@@ -43,6 +43,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 off
 # disable manage-gids on the server-side for now, gets enabled later
 TEST $CLI volume set ${V0} server.manage-gids off
 TEST $CLI volume start ${V0}
diff --git a/tests/bugs/glusterd/bug-1070734.t b/tests/bugs/glusterd/bug-1070734.t
index 5db60e0cfe..ea160d7ec6 100755
--- a/tests/bugs/glusterd/bug-1070734.t
+++ b/tests/bugs/glusterd/bug-1070734.t
@@ -17,6 +17,7 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
 ## Verify volume is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
+TEST $CLI volume set $V0 nfs.disable false
 
 ## Start volume and verify
 TEST $CLI volume start $V0;
diff --git a/tests/bugs/glusterd/bug-1209329_daemon-svcs-on-reset-volume.t b/tests/bugs/glusterd/bug-1209329_daemon-svcs-on-reset-volume.t
index aa24cf1c3f..f6ca953e40 100644
--- a/tests/bugs/glusterd/bug-1209329_daemon-svcs-on-reset-volume.t
+++ b/tests/bugs/glusterd/bug-1209329_daemon-svcs-on-reset-volume.t
@@ -39,14 +39,17 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_snapd_count
 TEST $CLI volume reset $V0 force;
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" get_snapd_count
 
-#enable nfs.disable options and verify
-TEST $CLI volume set $V0 nfs.disable on
-EXPECT 'on' volinfo_field $V0 'nfs.disable'
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" get_nfs_count
+##verify initial nfs disabled by default
+EXPECT "0" get_nfs_count
+
+##enable nfs and verify
+TEST $CLI volume set $V0 nfs.disable off
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
+EXPECT "1" get_nfs_count
 
 ##Do reset force which set the nfs.option to default
 TEST $CLI volume reset $V0 force;
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_nfs_count
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" get_nfs_count
 
 ##enable the uss option and verify snapd is running or not
 TEST $CLI volume set $V0 features.uss on
diff --git a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
index 4ef4c9d14a..4798959380 100644
--- a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
+++ b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
@@ -19,23 +19,25 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{1..2}
 TEST $CLI volume start $V0
 
 ## Perform attach-tier operation on volume $V0
-TEST $CLI volume attach-tier $V0 $H0:$B0/${V0}{3..4}
+TEST $CLI volume tier $V0 attach $H0:$B0/${V0}{3..4}
 
 ## detach-tier commit operation without force option on volume $V0
 ## should not succeed
-TEST ! $CLI volume detach-tier $V0 commit
+TEST ! $CLI --mode=script volume tier $V0 detach commit
 
 ## detach-tier commit operation with force option on volume $V0
 ## should succeed
-TEST  $CLI volume detach-tier $V0 force
+TEST  $CLI volume tier $V0 detach force
+
+sleep 3
 
 ## Again performing attach-tier operation on volume $V0
-TEST $CLI volume attach-tier $V0 $H0:$B0/${V0}{5..6}
+TEST $CLI volume tier $V0 attach $H0:$B0/${V0}{5..6}
 
 ## Do detach-tier start on volume $V0
-TEST $CLI volume detach-tier $V0 start
+TEST $CLI volume tier $V0 detach start
 
 ## Now detach-tier commit on volume $V0 should succeed.
-TEST $CLI volume detach-tier $V0 commit
+TEST $CLI volume tier $V0 detach commit
 
 cleanup;
diff --git a/tests/bugs/glusterd/bug-949930.t b/tests/bugs/glusterd/bug-949930.t
index 774802a66b..9a6d38fa37 100644
--- a/tests/bugs/glusterd/bug-949930.t
+++ b/tests/bugs/glusterd/bug-949930.t
@@ -10,9 +10,11 @@ TEST glusterd;
 TEST pidof glusterd;
 
 TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
+TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume start $V0;
 
 TEST $CLI volume create $V1 $H0:$B0/${V1}{1,2};
+TEST $CLI volume set $V1 nfs.disable off
 TEST $CLI volume start $V1;
 
 TEST ! $CLI volume set $V0 performance.nfs.read-ahead blah
diff --git a/tests/bugs/glusterfs-server/bug-864222.t b/tests/bugs/glusterfs-server/bug-864222.t
index cbda7d27f3..3a46c28359 100755
--- a/tests/bugs/glusterfs-server/bug-864222.t
+++ b/tests/bugs/glusterfs-server/bug-864222.t
@@ -9,6 +9,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/glusterfs-server/bug-887145.t b/tests/bugs/glusterfs-server/bug-887145.t
index 35e1c92839..9b940259f5 100755
--- a/tests/bugs/glusterfs-server/bug-887145.t
+++ b/tests/bugs/glusterfs-server/bug-887145.t
@@ -9,6 +9,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
 TEST $CLI volume set $V0 performance.open-behind off;
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 
 ## Mount FUSE with caching disabled
diff --git a/tests/bugs/glusterfs-server/bug-904300.t b/tests/bugs/glusterfs-server/bug-904300.t
index 8ce805cfcd..eea1c5b546 100755
--- a/tests/bugs/glusterfs-server/bug-904300.t
+++ b/tests/bugs/glusterfs-server/bug-904300.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
 
diff --git a/tests/bugs/glusterfs/bug-867253.t b/tests/bugs/glusterfs/bug-867253.t
index 41972a7731..acbbdf8c1e 100644
--- a/tests/bugs/glusterfs/bug-867253.t
+++ b/tests/bugs/glusterfs/bug-867253.t
@@ -26,6 +26,7 @@ TEST glusterd
 TEST pidof glusterd
 
 TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
+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/glusterfs/bug-872923.t b/tests/bugs/glusterfs/bug-872923.t
index de24117a03..72e8f23086 100755
--- a/tests/bugs/glusterfs/bug-872923.t
+++ b/tests/bugs/glusterfs/bug-872923.t
@@ -10,6 +10,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info
 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
 
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
diff --git a/tests/bugs/nfs/bug-1053579.t b/tests/bugs/nfs/bug-1053579.t
index 81e786d2ec..f616eb2baa 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 5527f768b4..c9ed840ec9 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 1a9270286f..b194b3744b 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 469b221f5b..740d638193 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 ed7761db3e..1304ad905b 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 c8f63d50b0..f986fe36ab 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 cdac24e3e8..4232b9d874 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 22167e87e5..3b836745a0 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 47eb396b53..a47893d7fc 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 ff6797bcbe..0becb756da 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 72bdf2c0d9..d70c36f0a5 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 9ed19915a6..d05e7df1a9 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 94a800a2ce..ca5f2af6f2 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
diff --git a/tests/bugs/quota/bug-1087198.t b/tests/bugs/quota/bug-1087198.t
index 1acf656e09..0694b251d9 100644
--- a/tests/bugs/quota/bug-1087198.t
+++ b/tests/bugs/quota/bug-1087198.t
@@ -28,7 +28,7 @@ build_tester $(dirname $0)/../../basic/quota.c -o $QDD
 TEST glusterd
 
 TEST $CLI volume create $V0 $H0:$B0/brick{1..4};
-
+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/quota/bug-1153964.t b/tests/bugs/quota/bug-1153964.t
index 37f3453664..d84a9b36d2 100644
--- a/tests/bugs/quota/bug-1153964.t
+++ b/tests/bugs/quota/bug-1153964.t
@@ -43,6 +43,7 @@ cleanup;
 TEST glusterd
 
 TEST $CLI volume create $V0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 
 TEST $CLI volume quota $V0 enable
diff --git a/tests/bugs/quota/bug-1243798.t b/tests/bugs/quota/bug-1243798.t
index c5def29710..53f8b10adb 100644
--- a/tests/bugs/quota/bug-1243798.t
+++ b/tests/bugs/quota/bug-1243798.t
@@ -9,7 +9,7 @@ cleanup;
 TEST 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;
diff --git a/tests/bugs/replicate/bug-830665.t b/tests/bugs/replicate/bug-830665.t
index 3d2ec1145d..c748c1304b 100755
--- a/tests/bugs/replicate/bug-830665.t
+++ b/tests/bugs/replicate/bug-830665.t
@@ -18,6 +18,7 @@ TEST $CLI volume info;
 recreate ${B0}/${V0}-0
 recreate ${B0}/${V0}-1
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}-{0,1}
+TEST $CLI volume set $V0 nfs.disable false
 
 function volinfo_field()
 {
diff --git a/tests/bugs/replicate/bug-966018.t b/tests/bugs/replicate/bug-966018.t
index ec3beb15d5..1b5296b498 100644
--- a/tests/bugs/replicate/bug-966018.t
+++ b/tests/bugs/replicate/bug-966018.t
@@ -16,6 +16,7 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/r2_0 $H0:$B0/r2_1
 TEST $CLI volume set $V0 ensure-durability off
 TEST $CLI volume set $V0 cluster.eager-lock on
 TEST $CLI volume set $V0 cluster.post-op-delay-secs 3
+TEST $CLI volume set $V0 nfs.disable false
 
 TEST $CLI volume start $V0
 TEST $CLI volume profile $V0 start
diff --git a/tests/bugs/rpc/bug-1043886.t b/tests/bugs/rpc/bug-1043886.t
index e6bd45440b..b18680289a 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 627c47b335..31a63b56a3 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 46a3442f18..458996b57b 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
diff --git a/tests/bugs/snapshot/bug-1166197.t b/tests/bugs/snapshot/bug-1166197.t
index 739839fab8..7350acfa9e 100755
--- a/tests/bugs/snapshot/bug-1166197.t
+++ b/tests/bugs/snapshot/bug-1166197.t
@@ -15,6 +15,7 @@ TEST pidof glusterd;
 TEST setup_lvm 1
 
 TEST $CLI volume create $V0 $H0:$L1
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 TEST $CLI snapshot config activate-on-create enable
 TEST $CLI volume set $V0 features.uss enable
diff --git a/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
index 0893826b34..3776451c15 100644
--- a/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
+++ b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
@@ -72,6 +72,7 @@ TEST setup_lvm 1
 TEST glusterd
 
 TEST $CLI volume create $V0 $H0:$L1
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 
 # Mount the volume as both fuse and nfs mount
diff --git a/tests/bugs/snapshot/bug-1260848.t b/tests/bugs/snapshot/bug-1260848.t
index 9963b29360..7eae3982e4 100644
--- a/tests/bugs/snapshot/bug-1260848.t
+++ b/tests/bugs/snapshot/bug-1260848.t
@@ -11,6 +11,7 @@ TEST glusterd
 TEST pidof glusterd
 
 TEST $CLI volume create $V0 disperse 6 redundancy 2 $H0:$B0/${V0}{0..5}
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume set $V0 uss on
 TEST $CLI volume start $V0