diff options
| author | vmallika <vmallika@redhat.com> | 2015-07-13 13:55:26 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-07-13 21:02:21 -0700 |
| commit | 756c729593dfd2ef68102a732596d083278a11fa (patch) | |
| tree | b069fede2eb293d23d246098092594baa01cae94 /tests/basic/ec/quota.t | |
| parent | 19ce68e9000148586f4af8f14ee8b71ae38088c0 (diff) | |
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 <spandit@redhat.com>
> Signed-off-by: vmallika <vmallika@redhat.com>
> Reviewed-on: http://review.gluster.org/11125
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Change-Id: Iccc36de2b3a1e1a068d1a8d5e98d413c3afa1bc7
BUG: 1242329
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11642
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'tests/basic/ec/quota.t')
| -rwxr-xr-x | tests/basic/ec/quota.t | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/tests/basic/ec/quota.t b/tests/basic/ec/quota.t index cc2d4bd9efa..f093085bde0 100755 --- a/tests/basic/ec/quota.t +++ b/tests/basic/ec/quota.t @@ -3,24 +3,6 @@ . $(dirname $0)/../../include.rc . $(dirname $0)/../../volume.rc -function hard_limit() -{ - local QUOTA_PATH=$1; - $CLI volume quota $V0 list $QUOTA_PATH | grep "$QUOTA_PATH" | awk '{print $2}' -} - -function soft_limit() -{ - local QUOTA_PATH=$1; - $CLI volume quota $V0 list $QUOTA_PATH | grep "$QUOTA_PATH" | awk '{print $3}' -} - -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 @@ -41,8 +23,8 @@ TEST $CLI volume quota $V0 enable TEST $CLI volume quota $V0 limit-usage /test 10MB -EXPECT "10.0MB" hard_limit "/test"; -EXPECT "80%" soft_limit "/test"; +EXPECT "10.0MB" quota_hard_limit "/test"; +EXPECT "80%" quota_soft_limit "/test"; TEST $CLI volume quota $V0 soft-timeout 0 TEST $CLI volume quota $V0 hard-timeout 0 @@ -50,13 +32,13 @@ TEST $CLI volume quota $V0 hard-timeout 0 TEST ! $QDD $M0/test/file1.txt 256 48 TEST rm $M0/test/file1.txt -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test" +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quotausage "/test" TEST $QDD $M0/test/file2.txt 256 32 -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test" +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" quotausage "/test" TEST rm $M0/test/file2.txt -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test" +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quotausage "/test" TEST $CLI volume stop $V0 EXPECT "1" get_aux |