From 756c729593dfd2ef68102a732596d083278a11fa Mon Sep 17 00:00:00 2001 From: vmallika Date: Mon, 13 Jul 2015 13:55:26 +0530 Subject: features/quota : Fix spurious failure This is a backport of http://review.gluster.org/#/c/11125/ Problem : Basically, in this test case a file is created which exceeds the quota limit. Once the limit is reached that file will be deleted. At the same moment we are testing inode-quota. It can so happen that before the marker updates the information related to deletion of file, a new file creation operation comes and sees that quota limit is still exceeded. Solution : Inducing a check to see if marker updation completed successfully. Updated all the test case which has the similar machanism and also moved the "usage" function to a common place "volume.rc" > Change-Id: I36ddbc5ebbf1b74c9d326a0d1d5f3b32f20a906a > BUG: 1229297 > Signed-off-by: Sachin Pandit > Signed-off-by: vmallika > Reviewed-on: http://review.gluster.org/11125 > Tested-by: NetBSD Build System > Tested-by: Gluster Build System > Reviewed-by: Krishnan Parthasarathi Change-Id: Iccc36de2b3a1e1a068d1a8d5e98d413c3afa1bc7 BUG: 1242329 Signed-off-by: vmallika Reviewed-on: http://review.gluster.org/11642 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi --- tests/basic/quota-nfs.t | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'tests/basic/quota-nfs.t') diff --git a/tests/basic/quota-nfs.t b/tests/basic/quota-nfs.t index ef337a7b3ae..f295aaee79b 100755 --- a/tests/basic/quota-nfs.t +++ b/tests/basic/quota-nfs.t @@ -4,13 +4,6 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc -function usage() -{ - local QUOTA_PATH=$1; - $CLI volume quota $V0 list $QUOTA_PATH | \ - grep "$QUOTA_PATH" | awk '{print $4}' -} - cleanup; QDD=$(dirname $0)/quota # compile the test write program and run it @@ -42,7 +35,7 @@ TEST $CLI volume quota $V0 hard-timeout 0 TEST $QDD $N0/$deep/newfile_1 256 20 # wait for write behind to complete. -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" usage "/" +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" quotausage "/" # Try to create a 100Mb file which should fail TEST ! $QDD $N0/$deep/newfile_2 256 400 -- cgit