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/glusterd | |
| 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/glusterd')
4 files changed, 19 insertions, 11 deletions
diff --git a/tests/bugs/glusterd/bug-1070734.t b/tests/bugs/glusterd/bug-1070734.t index 5db60e0cfe6..ea160d7ec6b 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 aa24cf1c3f5..f6ca953e40b 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 4ef4c9d14ad..4798959380e 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 774802a66b2..9a6d38fa37f 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 |