diff options
Diffstat (limited to 'tests/basic/tier/tier.t')
| -rwxr-xr-x | tests/basic/tier/tier.t | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 5bb2dc95164..a197d6eb127 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -11,22 +11,14 @@ DEMOTE_TIMEOUT=12 PROMOTE_TIMEOUT=5 MIGRATION_TIMEOUT=10 DEMOTE_FREQ=4 -PROMOTE_FREQ=4 - - -# Timing adjustment to avoid spurious errors with first instances of file_on_fast_tier -function sleep_first_cycle { - startTime=$(date +%s) - mod=$(( ( $startTime % $DEMOTE_FREQ ) + 1 )) - sleep $mod -} +PROMOTE_FREQ=12 function file_on_slow_tier { found=0 for i in `seq 0 $LAST_BRICK`; do - test -e $B0/${V0}${i}/$1 && found=1 && break; + test -e "$B0/${V0}${i}/$1" && found=1 && break; done if [ "$found" == "1" ] @@ -56,7 +48,7 @@ function file_on_fast_tier { found=0 for j in `seq $CACHE_BRICK_FIRST $CACHE_BRICK_LAST`; do - test -e $B0/${V0}${j}/$1 && found=1 && break; + test -e "$B0/${V0}${j}/$1" && found=1 && break; done @@ -120,10 +112,14 @@ TEST ! $CLI volume set $V0 cluster.tier-max-files -3 TEST ! $CLI volume set $V0 cluster.watermark-low 90 # stop the volume and restart it. The rebalance daemon should restart. +cd /tmp +umount $M0 TEST $CLI volume stop $V0 TEST $CLI volume start $V0 +TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; +cd $M0 -sleep_first_cycle +sleep_first_cycle $DEMOTE_FREQ $CLI volume tier $V0 status #Tier options expect non-negative value @@ -158,9 +154,12 @@ uuidgen > /tmp/d1/data2.txt md5data2=$(fingerprint /tmp/d1/data2.txt) cp /tmp/d1/data2.txt ./d1/data2.txt -uuidgen > /tmp/d1/data3.txt -md5data3=$(fingerprint /tmp/d1/data3.txt) -mv /tmp/d1/data3.txt ./d1/data3.txt +#File with spaces and special characters. +SPACE_FILE="file with spaces & $peci@l ch@r@cter$ @!@$%^$#@^^*&%$#$%.txt" + +uuidgen > "/tmp/d1/$SPACE_FILE" +md5space=$(fingerprint "/tmp/d1/$SPACE_FILE") +mv "/tmp/d1/$SPACE_FILE" "./d1/$SPACE_FILE" # Check auto-demotion on write new. sleep $DEMOTE_TIMEOUT @@ -169,11 +168,12 @@ sleep $DEMOTE_TIMEOUT UUID=$(uuidgen) echo $UUID >> /tmp/d1/data2.txt md5data2=$(fingerprint /tmp/d1/data2.txt) -echo $UUID >> ./d1/data2.txt -# Check promotion on read to slow tier +sleep_until_mid_cycle $DEMOTE_FREQ drop_cache $M0 -cat d1/data3.txt + +echo $UUID >> ./d1/data2.txt +cat "./d1/$SPACE_FILE" sleep $PROMOTE_TIMEOUT sleep $DEMOTE_FREQ @@ -185,7 +185,7 @@ TEST glusterd 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 +EXPECT "0" file_on_slow_tier "./d1/$SPACE_FILE" $md5space TEST $CLI volume tier $V0 detach start |