diff options
Diffstat (limited to 'tests/basic/quota-anon-fd-nfs.t')
| -rwxr-xr-x | tests/basic/quota-anon-fd-nfs.t | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/basic/quota-anon-fd-nfs.t b/tests/basic/quota-anon-fd-nfs.t index c6b01553b02..9e6675af6ec 100755 --- a/tests/basic/quota-anon-fd-nfs.t +++ b/tests/basic/quota-anon-fd-nfs.t @@ -5,6 +5,8 @@ . $(dirname $0)/../nfs.rc . $(dirname $0)/../fileio.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; QDD=$(dirname $0)/quota @@ -50,6 +52,7 @@ TEST $CLI volume quota $V0 limit-usage / 1 TEST $CLI volume quota $V0 soft-timeout 0 TEST $CLI volume quota $V0 hard-timeout 0 +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; TEST mount_nfs $H0:/$V0 $N0 noac,soft,nolock,vers=3; deep=/0/1/2/3/4/5/6/7/8/9 TEST mkdir -p $N0/$deep @@ -97,8 +100,16 @@ $CLI volume statedump $V0 all EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 +# This is ugly, but there seems to be a latent race between other actions and +# stopping the volume. The visible symptom is that "umount -l" (run from +# gf_umount_lazy in glusterd) hangs. This happens pretty consistently with the +# new mem-pool code, though it's not really anything to do with memory pools - +# just with changed timing. Adding the sleep here makes it work consistently. +# +# If anyone else wants to debug the race condition, feel free. +sleep 3 + TEST $CLI volume stop $V0 -EXPECT "1" get_aux rm -f $QDD |