summaryrefslogtreecommitdiffstats
path: root/tests/basic/tier/legacy-many.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/basic/tier/legacy-many.t')
-rw-r--r--tests/basic/tier/legacy-many.t19
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/basic/tier/legacy-many.t b/tests/basic/tier/legacy-many.t
index 2c7ff3e5407..6e1147aec2d 100644
--- a/tests/basic/tier/legacy-many.t
+++ b/tests/basic/tier/legacy-many.t
@@ -9,13 +9,12 @@ LAST_BRICK=3
CACHE_BRICK_FIRST=4
CACHE_BRICK_LAST=5
DEMOTE_TIMEOUT=12
-PROMOTE_TIMEOUT=5
+PROMOTE_TIMEOUT=12
MIGRATION_TIMEOUT=10
DEMOTE_FREQ=60
-PROMOTE_FREQ=4
+PROMOTE_FREQ=10
TEST_DIR="test_files"
-NUM_FILES=20
-
+NUM_FILES=15
function read_all {
for file in *
@@ -49,19 +48,25 @@ wait
TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST
TEST $CLI volume rebalance $V0 tier status
+
TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
TEST $CLI volume set $V0 cluster.read-freq-threshold 0
TEST $CLI volume set $V0 cluster.write-freq-threshold 0
+# wait a little for lookup heal to finish
+sleep 10
+
# Read "legacy" files
drop_cache $M0
-cd ${TEST_DIR}
+
+sleep_until_mid_cycle $DEMOTE_FREQ
+
TEST read_all
# Test to make sure files were promoted as expected
-sleep $DEMOTE_TIMEOUT
-EXPECT_WITHIN $DEMOTE_TIMEOUT "0" check_counters $NUM_FILES 0
+sleep $PROMOTE_TIMEOUT
+EXPECT_WITHIN $PROMOTE_TIMEOUT "0" check_counters $NUM_FILES 0
cd;
cleanup