summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorDan Lambright <dlambrig@redhat.com>2015-04-13 02:42:12 +0100
committerVijay Bellur <vbellur@redhat.com>2015-05-09 08:35:14 -0700
commit99b778cbe179104af602b6eedebd31695bec16ae (patch)
tree5352721732f773b117b4a1c771577cedfaf329f4 /tests/basic
parent5fd6b3b7e2881d21a1b19fb22366e905314d71bc (diff)
glusterd: support for tier volumes 'detach start' and 'detach commit'
Back port of http://review.gluster.org/10108 These commands work in a manner analagous to rebalancing when removing a brick. The existing migration daemon detects "detach start" and switches to moving data off the hot tier. While in this state all lookups are directed to the cold tier. gluster v detach-tier <vol> start gluster v detach-tier <vol> commit The status and stop cli commands shall be submitted separately. >Change-Id: I24fda5cc3ba74f5fb8aa9a3234ad51f18b80a8a0 >BUG: 1205540 >Signed-off-by: Dan Lambright <dlambrig@redhat.com> >Signed-off-by: root <root@localhost.localdomain> >Signed-off-by: Dan Lambright <dlambrig@redhat.com> >Reviewed-on: http://review.gluster.org/10108 >Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Change-Id: I212d748d077fb5870ee84b316c653acbafbea3f7 BUG: 1220047 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/10708 Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/basic')
-rwxr-xr-xtests/basic/tier/tier.t22
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t
index 6097ad6e7d6..fe15395cf4b 100755
--- a/tests/basic/tier/tier.t
+++ b/tests/basic/tier/tier.t
@@ -36,7 +36,7 @@ function file_on_fast_tier {
function confirm_tier_removed {
$CLI system getspec $V0 | grep $1
- if [ $? == 0 ] ; then
+ if [ $? == 0 ]; then
echo "1"
else
echo "0"
@@ -52,6 +52,11 @@ function confirm_vol_stopped {
fi
}
+LAST_BRICK=1
+CACHE_BRICK=2
+DEMOTE_TIMEOUT=12
+PROMOTE_TIMEOUT=5
+MIGRATION_TIMEOUT=10
cleanup
@@ -108,21 +113,18 @@ sleep 5
EXPECT_WITHIN $PROMOTE_TIMEOUT "0" file_on_fast_tier d1/data2.txt
EXPECT_WITHIN $PROMOTE_TIMEOUT "0" file_on_fast_tier d1/data3.txt
-# Test rebalance commands
-TEST $CLI volume rebalance $V0 tier status
-TEST $CLI volume rebalance $V0 stop
-
# stop gluster, when it comes back info file should have tiered volume
killall glusterd
TEST glusterd
-# TODO: Remove force. Gracefully migrate data off hot tier.
-# Rebalance+promotion/demotion is under construction.
+# Test rebalance commands
+TEST $CLI volume rebalance $V0 tier status
+
+TEST $CLI volume detach-tier $V0 start
-TEST $CLI volume detach-tier $V0
+TEST $CLI volume detach-tier $V0 commit
-# temporarily comment out
-#TEST ! [ -e $M0/d1/data.txt ]
+EXPECT "0" file_on_slow_tier d1/data.txt
EXPECT "0" confirm_tier_removed ${V0}${CACHE_BRICK_FIRST}