diff options
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} |