tests: use single-brick volume for mount-nfs-auth.t

When running with the replica-3 volume, the "big_write" test sometimes
becomes unresponsive. This seems to be an issue (bug 1226941) in the
RPC/socket-layer, and not related to the NFS test itself.

BUG: 1163543
Change-Id: I51115e4b68d45f3ef7902b4f7a8535518d09408f
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/11085
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Niels de Vos 2015-06-01 16:10:40 +02:00
parent 381afd4f48
commit 7a2fb3694d
2 changed files with 5 additions and 5 deletions

View File

@ -195,7 +195,6 @@ function is_bad_test ()
{
local name=$1
for bt in ./tests/basic/quota-anon-fd-nfs.t \
./tests/basic/mount-nfs-auth.t\
; do
[ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success
done

View File

@ -64,7 +64,7 @@ function netgroup_deny_this_host () {
}
function create_vol () {
TEST $CLI vol create $V0 replica 3 $H0:$B0/b0 $H0:$B0/b1 $H0:$B0/b2
$CLI vol create $V0 $H0:$B0/b0
}
function setup_cluster() {
@ -143,9 +143,7 @@ function restart_nfs () {
setup_cluster
# run preliminary tests
TEST $CLI vol set $V0 cluster.self-heal-daemon off
TEST $CLI vol set $V0 nfs.disable off
TEST $CLI vol set $V0 cluster.choose-local off
TEST $CLI vol start $V0
# Get NFS state directory
@ -209,7 +207,10 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST export_deny_this_host
TEST netgroup_allow_this_host
EXPECT_WITHIN $AUTH_REFRESH_INTERVAL "Y" check_mount_success $V0
# wait for the mount authentication to rebuild
sleep $[$AUTH_REFRESH_INTERVAL + 1]
EXPECT "Y" check_mount_success $V0
EXPECT "Y" small_write
TEST big_write
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0