diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/tier/file_with_spaces.t | 1 | ||||
| -rwxr-xr-x | tests/basic/tier/fops-during-migration-pause.t | 9 | ||||
| -rwxr-xr-x | tests/basic/tier/fops-during-migration.t | 1 | ||||
| -rw-r--r-- | tests/basic/tier/legacy-many.t | 3 | ||||
| -rwxr-xr-x | tests/basic/tier/locked_file_migration.t | 1 | ||||
| -rwxr-xr-x | tests/basic/tier/tier_lookup_heal.t | 1 |
6 files changed, 11 insertions, 5 deletions
diff --git a/tests/basic/tier/file_with_spaces.t b/tests/basic/tier/file_with_spaces.t index 11bd1d2bf2a..7492804da1b 100755 --- a/tests/basic/tier/file_with_spaces.t +++ b/tests/basic/tier/file_with_spaces.t @@ -28,6 +28,7 @@ function create_dist_tier_vol () { TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ TEST $CLI volume set $V0 cluster.read-freq-threshold 50 TEST $CLI volume set $V0 cluster.write-freq-threshold 50 + TEST $CLI volume set $V0 cluster.tier-mode test } diff --git a/tests/basic/tier/fops-during-migration-pause.t b/tests/basic/tier/fops-during-migration-pause.t index 332e4bb1c03..f50d666ef27 100755 --- a/tests/basic/tier/fops-during-migration-pause.t +++ b/tests/basic/tier/fops-during-migration-pause.t @@ -2,11 +2,11 @@ . $(dirname $0)/../../include.rc . $(dirname $0)/../../volume.rc - +. $(dirname $0)/../../tier.rc NUM_BRICKS=3 -DEMOTE_FREQ=5 -PROMOTE_FREQ=5 +DEMOTE_FREQ=10 +PROMOTE_FREQ=10 TEST_STR="Testing write and truncate fops on tier migration" @@ -37,6 +37,7 @@ function create_dist_tier_vol () { 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 + TEST $CLI volume set $V0 cluster.tier-mode test } @@ -58,7 +59,7 @@ TEST mkdir $M0/dir1 # Create a large file (800MB), so that rebalance takes time # The file will be created on the hot tier - +sleep_until_mid_cycle $DEMOTE_FREQ dd if=/dev/zero of=$M0/dir1/FILE1 bs=256k count=5120 # Get the path of the file on the hot tier diff --git a/tests/basic/tier/fops-during-migration.t b/tests/basic/tier/fops-during-migration.t index aa868847738..b80511a400d 100755 --- a/tests/basic/tier/fops-during-migration.t +++ b/tests/basic/tier/fops-during-migration.t @@ -28,6 +28,7 @@ function create_dist_tier_vol () { 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 + TEST $CLI volume set $V0 cluster.tier-mode test } diff --git a/tests/basic/tier/legacy-many.t b/tests/basic/tier/legacy-many.t index 6e1147aec2d..0f32ff60a19 100644 --- a/tests/basic/tier/legacy-many.t +++ b/tests/basic/tier/legacy-many.t @@ -36,6 +36,7 @@ TEST $CLI volume set $V0 performance.quick-read off TEST $CLI volume set $V0 performance.io-cache off TEST $CLI volume set $V0 features.ctr-enabled on + TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; # Create a number of "legacy" files before attaching tier @@ -48,7 +49,7 @@ 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-mode test 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 diff --git a/tests/basic/tier/locked_file_migration.t b/tests/basic/tier/locked_file_migration.t index 7a03d1e3d36..f7a9d1f355d 100755 --- a/tests/basic/tier/locked_file_migration.t +++ b/tests/basic/tier/locked_file_migration.t @@ -31,6 +31,7 @@ function create_dist_tier_vol () { #We don't want promotes to happen in this test TEST $CLI volume set $V0 cluster.read-freq-threshold 10 TEST $CLI volume set $V0 cluster.write-freq-threshold 10 + TEST $CLI volume set $V0 cluster.tier-mode test } diff --git a/tests/basic/tier/tier_lookup_heal.t b/tests/basic/tier/tier_lookup_heal.t index 625b6b747ae..81bb0d67179 100755 --- a/tests/basic/tier/tier_lookup_heal.t +++ b/tests/basic/tier/tier_lookup_heal.t @@ -52,6 +52,7 @@ TEST $CLI volume set $V0 cluster.read-freq-threshold 0 TEST $CLI volume set $V0 cluster.write-freq-threshold 0 TEST $CLI volume set $V0 performance.quick-read off TEST $CLI volume set $V0 performance.io-cache off +TEST $CLI volume set $V0 cluster.tier-mode test #The lookup should heal the database. TEST ls file1 |