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/volume.rc | |
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/volume.rc')
-rw-r--r-- | tests/volume.rc | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/tests/volume.rc b/tests/volume.rc index 1cb37b81ef6..8ae214bdc5c 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -546,18 +546,42 @@ function get_scrubd_count { function quota_list_field () { local QUOTA_PATH=$1 local FIELD=$2 - $CLI volume quota $V0 list $QUOTA_PATH | grep $QUOTA_PATH\ - | awk '{print $FIELD}' + local cmd="$CLI volume quota $V0 list $QUOTA_PATH | grep $QUOTA_PATH | awk '{print \$$FIELD}'" + + $cmd } function quota_object_list_field () { local QUOTA_PATH=$1 local FIELD=$2 - $CLI volume quota $V0 list-objects $QUOTA_PATH | grep $QUOTA_PATH\ - | awk '{print $FIELD}' + local cmd="$CLI volume quota $V0 list-objects $QUOTA_PATH | grep $QUOTA_PATH | awk '{print \$$FIELD}'" + + $cmd } -function quota_usage() +function quotausage() { quota_list_field $1 4 } + +function quota_hard_limit() +{ + quota_list_field $1 2 +} + +function quota_soft_limit() +{ + quota_list_field $1 3 +} + +function quota_sl_exceeded() +{ + quota_list_field $1 6 +} + +function quota_hl_exceeded() +{ + quota_list_field $1 7 + +} + |