diff options
Diffstat (limited to 'tests/basic/tier')
| -rw-r--r-- | tests/basic/tier/legacy-many.t | 13 | ||||
| -rwxr-xr-x | tests/basic/tier/tier.t | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/tests/basic/tier/legacy-many.t b/tests/basic/tier/legacy-many.t index 0f32ff60a19..e419bec53bc 100644 --- a/tests/basic/tier/legacy-many.t +++ b/tests/basic/tier/legacy-many.t @@ -58,6 +58,11 @@ TEST $CLI volume set $V0 cluster.write-freq-threshold 0 # wait a little for lookup heal to finish sleep 10 +# make sure fix layout completed +CPATH=$B0/${V0}0 +echo $CPATH > /tmp/out +TEST getfattr -n "trusted.tier.fix.layout.complete" $CPATH + # Read "legacy" files drop_cache $M0 @@ -69,5 +74,13 @@ TEST read_all sleep $PROMOTE_TIMEOUT EXPECT_WITHIN $PROMOTE_TIMEOUT "0" check_counters $NUM_FILES 0 +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" detach_start $V0 +EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" remove_brick_status_completed_field "$V0 $H0:$B0/${V0}${CACHE_BRICK_FIRST}" + +TEST $CLI volume tier $V0 detach commit + +# fix layout flag should be cleared +TEST ! getfattr -n "trusted.tier.fix.layout.complete" $CPATH + cd; cleanup diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index cfd8e775f7f..4b3693037fe 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -13,11 +13,6 @@ MIGRATION_TIMEOUT=10 DEMOTE_FREQ=4 PROMOTE_FREQ=12 -function detach_start { - $CLI volume tier $1 detach start - echo $?; -} - function file_on_slow_tier { found=0 |