diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-08-21 06:45:46 -0400 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-09-10 10:59:11 -0700 |
| commit | 0628c77f9069e93c49993722ac577becfcf902db (patch) | |
| tree | e3cc04d830a48af03cab34629bfddc5568b7801b /tests | |
| parent | 61a60de37e7fdfa0b9a9ec83c3edc7a94e4e0ed2 (diff) | |
cluster/tier: add gluster v tier <vol>
This is a backport of 11984.
> Currently the tier feature piggy backs off the rebalance command
> syntax to obtain status and this is clumsy. Introduce a new
> tier command that can do tier specific operations, starting
> with volume status to display counters.
> Old commands:
> gluster volume attach-tier <vol> [replica count] {bricklist..}
> gluster volume detach-tier <vol> {start|stop|commit}
> New commands:
> gluster volume tier <vol> attach [replica count] {bricklist} |
> detach {start|stop|commit} |
> status
> Change-Id: Ic07b3c6260588162de7d34380f8cbd3d8a7f35d3
> BUG: 1255693
> Signed-off-by: Dan Lambright <dlambrig@redhat.com>
> Reviewed-on: http://review.gluster.org/11984
> Reviewed-by: Gaurav Kumar Garg <ggarg@redhat.com>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: Id45bd0fa6b8606dd47863de83a694908da393229
BUG: 1261664
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/12143
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Gaurav Kumar Garg <ggarg@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/tier/tier.t | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 42e6436252c..4e788d3ea8a 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -62,7 +62,8 @@ TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0..$LAST_BRICK} # testing bug 1215122, ie should fail if replica count and bricks are not compatible. -TEST ! $CLI volume attach-tier $V0 replica 5 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST + +TEST ! $CLI volume tier $V0 attach replica 5 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST TEST $CLI volume start $V0 @@ -74,9 +75,16 @@ TEST $CLI volume set $V0 features.ctr-enabled on TEST ! $CLI volume set $V0 cluster.tier-demote-frequency 4 #testing bug #1228112, glusterd crashed when trying to detach-tier commit force on a non-tiered volume. -TEST ! $CLI volume detach-tier $V0 commit force +TEST ! $CLI volume tier $V0 detach commit force + +TEST $CLI volume tier $V0 attach replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST + +# stop the volume and restart it. The rebalance daemon should restart. +TEST $CLI volume stop $V0 +TEST $CLI volume start $V0 -TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST +sleep_first_cycle +$CLI volume tier $V0 status #Tier options expect non-negative value TEST ! $CLI volume set $V0 cluster.tier-promote-frequency -1 @@ -135,9 +143,9 @@ TEST glusterd # Test rebalance commands TEST $CLI volume rebalance $V0 tier status -TEST $CLI volume detach-tier $V0 start +TEST $CLI volume tier $V0 detach start -TEST $CLI volume detach-tier $V0 commit force +TEST $CLI volume tier $V0 detach commit force EXPECT "0" file_on_slow_tier d1/data.txt |