DIR=${DIR:-$MOUNT}
assert_DIR
-POOLSLOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
-[ "$POOLSLOG" ] && rm -f $POOLSLOG || true
build_test_filter
FAIL_ON_ERROR=${FAIL_ON_ERROR:-true}
return 0
}
+file_pool() {
+ $GETSTRIPE -v $1 | grep "^lmm_pool:" | tr -d "[:blank:]" | cut -f 2 -d ':'
+}
+
check_file_not_in_pool() {
local file=$1
local pool=$2
- local res=$($GETSTRIPE -v $file | grep "^pool:" | tr -d "[:blank:]" | cut -f 2 -d ':')
+ local res=$(file_pool $file)
+
if [[ "$res" == "$pool" ]]; then
error "File $file is in pool: $res"
return 1
create_pool_fail p1234567891234567
echo "Creating a pool with a 1000 character pool name; should fail"
- NAME="p"
- for i in `seq 1 999`; do NAME=${NAME}"o"; done
- create_pool_fail $NAME
+ local pool_name="p"
+ for i in $(seq 1 999); do pool_name=${pool_name}"o"; done
+ create_pool_fail $pool_name
echo "pool_new should fail if fs-name or poolname are missing."
do_facet $SINGLEMDS lctl pool_new .pool1 2>/dev/null
do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL OST0000
drain_pool $POOL
- # 2. lustre-OST0000
+ # 2. $FSNAME-OST0000
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $FSNAME-OST0000
RC=$?; [[ $RC -eq 0 ]] || \
error "pool_add failed. $FSNAME $POOL $FSNAME-OST0000: $RC"
do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000
drain_pool $POOL
- # 3. lustre-OST0000_UUID
+ # 3. $FSNAME-OST0000_UUID
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $FSNAME-OST0000_UUID
RC=$?; [[ $RC -eq 0 ]] || \
error "pool_add failed. $FSNAME $POOL $FSNAME-OST0000_UUID: $RC"
do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000_UUID
drain_pool $POOL
- # 4. lustre-OST[0,1,2,3,]
+ # 4. $FSNAME-OST[0,1,2,3,]
TGT="$FSNAME-OST["
for i in $TGT_LIST; do TGT=${TGT}$(printf "$i," $i); done
TGT="${TGT}]"
do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $TGT
drain_pool $POOL
- # 5. lustre-OST[0-5/1]
+ # 5. $FSNAME-OST[0-5/1]
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT_ALL
RC=$?; [[ $RC -eq 0 ]] || \
error "pool_add failed. $FSNAME $POOL" "$TGT_ALL $RC"
}
run_test 17 "Referencing an empty pool"
-create_perf_one() {
- local dir=$1/d
+create_perf() {
+ local cdir=$1/d
local numfiles=$2
local time
- mkdir -p $dir
+ mkdir -p $cdir
sync; sleep 5 # give pending IO a chance to go to disk
- stat=$(createmany -o $dir/${tfile} $numfiles)
- rm -rf $dir
+ stat=$(createmany -o $cdir/${tfile} $numfiles)
+ rm -rf $cdir
sync
time=$(echo $stat | cut -f 5 -d ' ')
- echo $stat > /dev/stderr
+ echo $stat >> /dev/stderr
echo $time
}
-create_perf() {
- local t1=$(create_perf_one $1 $2)
- local t2=$(create_perf_one $1 $2)
- local t3=$(create_perf_one $1 $2)
- local time=$(echo "scale=2; ( $t1 + $t2 + $t3 ) / 3" | bc)
-
- echo "$time"
-}
-
test_18() {
set_cleanup_trap
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
- local numfiles=10000
- local i=0
- local time1
- local time2
- local time3
- local dir=$POOL_ROOT/dir
- local stat
- local diff
-
- time1=$(create_perf $dir $numfiles)
-
- create_pool_nofail $POOL
-
- add_pool $POOL $TGT_ALL "$TGT_UUID"
-
- create_dir $dir $POOL
- time2=$(create_perf $dir $numfiles)
-
- destroy_pool $POOL
-
- time3=$(create_perf $dir $numfiles)
-
- echo Time taken for $numfiles creates without pools: $time1
- echo Time taken for $numfiles creates with pools: $time2
- echo Time taken for $numfiles creates without pools: $time3
-
- deg=$(echo "scale=2; (($time2 - $time3) * 100 / $time3) > 5" | bc)
- diff=$(echo "scale=2; ($time2 - $time3) * 100 / $time3" | bc)
+ local numfiles=30000
+ local plaindir=$POOL_ROOT/plaindir
+ local pooldir=$POOL_ROOT/pooldir
+ local t1=0
+ local t2=0
+ local t3=0
+ local diff
+
+ for i in $(seq 1 3);
+ do
+ echo "Create performance, iteration $i, $numfiles files x 3"
+
+ time1=$(create_perf $plaindir $numfiles)
+ echo "iter $i: $numfiles creates without pool: $time1"
+ t1=$(echo "scale=2; $t1 + $time1" | bc)
+
+ create_pool_nofail $POOL > /dev/null
+ add_pool $POOL $TGT_ALL "$TGT_UUID" > /dev/null
+ create_dir $pooldir $POOL
+ time2=$(create_perf $pooldir $numfiles)
+ echo "iter $i: $numfiles creates with pool: $time2"
+ t2=$(echo "scale=2; $t2 + $time2" | bc)
+
+ destroy_pool $POOL > /dev/null
+ time3=$(create_perf $pooldir $numfiles)
+ echo "iter $i: $numfiles creates with missing pool: $time3"
+ t3=$(echo "scale=2; $t3 + $time3" | bc)
+
+ echo
+ done
+
+ time1=$(echo "scale=2; $t1 / $i" | bc)
+ echo Avg time taken for $numfiles creates without pool: $time1
+ time2=$(echo "scale=2; $t2 / $i" | bc)
+ echo Avg time taken for $numfiles creates with pool: $time2
+ time3=$(echo "scale=2; $t3 / $i" | bc)
+ echo Avg time taken for $numfiles creates with missing pool: $time3
+
+ # Set this high until we establish a baseline for what the degradation
+ # is / should be
+ max=30
+ diff=$(echo "scale=2; ($time2 - $time1) * 100 / $time1" | bc)
+ echo "No pool to wide pool: $diff %."
+ deg=$(echo "scale=2; $diff > $max" | bc)
+ [ "$deg" == "1" ] && error_ignore 23408 "Degradation with wide pool is $diff % (> $max %)"
+
+ max=15
+ diff=$(echo "scale=2; ($time3 - $time1) * 100 / $time1" | bc)
+ echo "No pool to missing pool: $diff %."
+ deg=$(echo "scale=2; $diff > $max" | bc)
+ [ "$deg" == "1" ] && error_ignore 23408 "Degradation with missing pool is $diff % (> $max %)"
- if [[ "$deg" == "1" ]]; then
- error "Performance degradation with pools is $diff %."
- else
- echo "Performance degradation with pools is $diff %."
- fi
return 0
}
run_test 18 "File create in a directory which references a deleted pool"
if [ "$pool" != "" ]; then
check_file_in_pool $file $pool
fi
- pool1=$($GETSTRIPE -v $file | grep "^pool:" |\
- tr -d '[:blank:]' | cut -f 2 -d ':')
+ pool1=$(file_pool $file)
count1=$($GETSTRIPE -v $file | grep "^lmm_stripe_count:" |\
tr -d '[:blank:]' | cut -f 2 -d ':')
size1=$($GETSTRIPE -v $file | grep "^lmm_stripe_size:" |\
}
run_test 26 "Choose other OSTs in the pool first in the creation remedy"
-log "cleanup: ======================================================"
cd $ORIG_PWD
+
+complete $(basename $0) $SECONDS
cleanup_pools $FSNAME
check_and_cleanup_lustre
-echo '=========================== finished ==============================='
-[ -f "$POOLSLOG" ] && cat $POOLSLOG && grep -q FAIL $POOLSLOG && exit 1 || true
-echo "$0: completed"
+exit_status
git://git.whamcloud.com / fs / lustre-release.git / blobdiff