andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test: fix spurious failure from ./tests/basic/quota-nfs.t

Browse Source 
Before checking for the quota usage,
umount and mount NFS mountpoint to flush the NFS cached data.

This test is fails on NetBSD, so marking the test as bad-test

Change-Id: I1f30f5d9a919b3959c9f158366bd2f47569c8e03
BUG: 1258766
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/12075
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
This commit is contained in:
vmallika 2015-09-01 14:21:43 +05:30 committed by Jeff Darcy
parent b5fff7326e
commit 76233f0cf4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
run-tests.sh
View File

@ -194,6 +194,7 @@ function is_bad_test ()
{
local name=$1
for bt in ./tests/basic/quota-anon-fd-nfs.t \
./tests/basic/quota-nfs.t \
./tests/basic/tier/tier_lookup_heal.t \
./tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t \
./tests/bugs/snapshot/bug-1109889.t \

14
tests/basic/quota-nfs.t
View File

@ -17,6 +17,7 @@ TEST $CLI volume create $V0 $H0:$B0/brick1;
EXPECT 'Created' volinfo_field $V0 'Status';
TEST $CLI volume set $V0 network.inode-lru-limit 1
TEST $CLI volume set $V0 performance.nfs.write-behind off
TEST $CLI volume start $V0;
EXPECT 'Started' volinfo_field $V0 'Status';
@ -34,6 +35,17 @@ TEST $CLI volume quota $V0 soft-timeout 0
TEST $CLI volume quota $V0 hard-timeout 0
TEST $QDD $N0/$deep/newfile_1 256 20
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/file
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/newfile_1
#Unmount and mount to flush the data
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST mount_nfs $H0:/$V0 $N0
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/file
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/newfile_1
# wait for write behind to complete.
EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" quotausage "/"
@ -42,7 +54,7 @@ TEST ! $QDD $N0/$deep/newfile_2 256 400
TEST rm -f $N0/$deep/newfile_2
## Before killing daemon to avoid deadlocks
umount_nfs $N0
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST $CLI volume stop $V0
EXPECT "1" get_aux