diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-08-21 06:45:46 -0400 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-09-09 14:56:36 -0700 |
| commit | d55a6fee5cdda8be9dd555b4f3b5c0cc005117ef (patch) | |
| tree | c747e6137038d69b0050fbe1c983c044e97c7b6b /tests | |
| parent | d35b8b60d7f436c5929dfa8d647f1d41aecfc237 (diff) | |
cluster/tier: add gluster v tier <vol>
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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/tier/tier.t | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 3b0b0bf280b..289fc2935b0 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -118,7 +118,7 @@ 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 @@ -134,16 +134,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 attach-tier $V0 replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST +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 sleep_first_cycle -$CLI volume rebalance $V0 tier status +$CLI volume tier $V0 status #Tier options expect non-negative value TEST ! $CLI volume set $V0 cluster.tier-promote-frequency -1 @@ -209,9 +209,9 @@ EXPECT "0" file_on_slow_tier d1/data.txt $md5data EXPECT "0" file_on_slow_tier d1/data2.txt $md5data2 EXPECT "0" file_on_slow_tier d1/data3.txt $md5data3 -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" confirm_tier_removed ${V0}${CACHE_BRICK_FIRST} |