diff options
author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-11 14:43:23 +0530 |
---|---|---|
committer | Atin Mukherjee <amukherj@redhat.com> | 2015-06-16 22:13:18 -0700 |
commit | a975c385c9cb0bb0b42993c2eb23a6f9bf277991 (patch) | |
tree | 943c96b4359704b2160c1b7183f91eedc4e84a88 /tests/basic | |
parent | bf6a71bcb08357766027e9318edae4b8298c339c (diff) |
tier/volume set: Validate volume set option for tier
Volume set option related to tier volume can only be set
for tier volume, also currently all volume set i for tier
option accepts a non-negative integer. This patch validate
both condition.
Back port of:
>Change-Id: I3611af048ff4ab193544058cace8db205ea92336
>BUG: 1216960
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Signed-off-by: Dan Lambright <dlambrig@redhat.com>
>Reviewed-on: http://review.gluster.org/10751
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: Joseph Fernandes
(cherry picked from commit f6a062044a3447bea5bf0fcf21a3f85c00fb6c7d)
Change-Id: Ic6081f0ce7ae7effac69ba192bd35c8d382a11d5
BUG: 1230560
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/11173
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Joseph Fernandes
Tested-by: Joseph Fernandes
Diffstat (limited to 'tests/basic')
-rwxr-xr-x | tests/basic/tier/tier.t | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 2a5f7486d7f..bec34ef2d99 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -52,8 +52,6 @@ function confirm_vol_stopped { fi } -LAST_BRICK=1 -CACHE_BRICK=2 DEMOTE_TIMEOUT=12 PROMOTE_TIMEOUT=5 MIGRATION_TIMEOUT=10 @@ -67,16 +65,27 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0..$LAST_BRICK} TEST ! $CLI volume attach-tier $V0 replica 5 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST TEST $CLI volume start $V0 -TEST $CLI volume set $V0 cluster.tier-demote-frequency 4 -TEST $CLI volume set $V0 cluster.tier-promote-frequency 4 -TEST $CLI volume set $V0 cluster.read-freq-threshold 0 -TEST $CLI volume set $V0 cluster.write-freq-threshold 0 + TEST $CLI volume set $V0 performance.quick-read off TEST $CLI volume set $V0 performance.io-cache off TEST $CLI volume set $V0 features.ctr-enabled on +#Not a tier volume +TEST ! $CLI volume set $V0 cluster.tier-demote-frequency 4 + TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST +#Tier options expect non-negative value +TEST ! $CLI volume set $V0 cluster.tier-promote-frequency -1 + +#Tier options expect non-negative value +TEST ! $CLI volume set $V0 cluster.read-freq-threshold qwerty + +TEST $CLI volume set $V0 cluster.tier-demote-frequency 4 +TEST $CLI volume set $V0 cluster.tier-promote-frequency 4 +TEST $CLI volume set $V0 cluster.read-freq-threshold 0 +TEST $CLI volume set $V0 cluster.write-freq-threshold 0 + TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; # Basic operations. |