diff options
| author | vmallika <vmallika@redhat.com> | 2015-03-02 13:10:24 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-03-31 23:31:44 -0700 |
| commit | d6b6c32ac7f0a6b3d77009aec8bdd0cd289bd0ff (patch) | |
| tree | 20ab138063bc0625172920336c99ad9e0e38b239 | |
| parent | 562cdace9152add786f156e38dc3fbc8805a69b7 (diff) | |
function gf_string2bytesize_range should handle 'xB' byte values
Change-Id: I208289aae2423e4bb015cf33bafd2a961e1c3fc6
BUG: 1197593
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/9779
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Sachin Pandit <spandit@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | libglusterfs/src/common-utils.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/common-utils.h | 1 | ||||
| -rwxr-xr-x | tests/basic/quota-ancestry-building.t | 2 | ||||
| -rw-r--r-- | tests/bugs/quota/bug-1087198.t | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 1adfdaa1673..f9eea5e5fd0 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -1493,7 +1493,7 @@ gf_string2bytesize_range (const char *str, uint64_t *n, uint64_t max) value *= GF_UNIT_TB; else if (strcasecmp (tail, GF_UNIT_PB_STRING) == 0) value *= GF_UNIT_PB; - else + else if (strcasecmp (tail, GF_UNIT_B_STRING) != 0) return -1; } diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index ecf25aa9177..d60ba89db55 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -60,6 +60,7 @@ void trap (void); #define GF_UNIT_TB 1099511627776ULL #define GF_UNIT_PB 1125899906842624ULL +#define GF_UNIT_B_STRING "B" #define GF_UNIT_KB_STRING "KB" #define GF_UNIT_MB_STRING "MB" #define GF_UNIT_GB_STRING "GB" diff --git a/tests/basic/quota-ancestry-building.t b/tests/basic/quota-ancestry-building.t index 1633e497922..0cb154ff146 100755 --- a/tests/basic/quota-ancestry-building.t +++ b/tests/basic/quota-ancestry-building.t @@ -22,7 +22,7 @@ TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 EXPECT 'Started' volinfo_field $V0 'Status'; TEST $CLI volume quota $V0 enable -TEST $CLI volume quota $V0 limit-usage / 1 +TEST $CLI volume quota $V0 limit-usage / 1B TEST $CLI volume quota $V0 soft-timeout 0 TEST $CLI volume quota $V0 hard-timeout 0 diff --git a/tests/bugs/quota/bug-1087198.t b/tests/bugs/quota/bug-1087198.t index ffc43c35acf..5121f1b35a2 100644 --- a/tests/bugs/quota/bug-1087198.t +++ b/tests/bugs/quota/bug-1087198.t @@ -47,7 +47,9 @@ TEST $CLI volume quota $V0 enable TEST $CLI volume quota $V0 alert-time 10 TEST $CLI volume quota $V0 hard-timeout 0 TEST $CLI volume quota $V0 soft-timeout 0 -TEST $CLI volume quota $V0 limit-usage / 200KB + +# Set limit to 200KB (204800B) +TEST $CLI volume quota $V0 limit-usage / 204800B TEST $CLI volume quota $V0 limit-usage /$QUOTA_LIMIT_DIR 100KB #16 |