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}
NON_EXISTANT_FS=nonexistantfs
INVALID_POOL=some_invalid_pool_name
TGT_COUNT=$OSTCOUNT
-TGT_FIRST=0
-TGT_MAX=$((TGT_COUNT-1))
+TGT_FIRST=$(printf %04x 0)
+TGT_MAX=$(printf %04x $((TGT_COUNT-1)))
TGT_STEP=1
-TGT_LIST=$(seq $TGT_FIRST $TGT_STEP $TGT_MAX)
-TGT_LIST2=$(seq $TGT_FIRST 2 $TGT_MAX)
+TGT_LIST=$(seq 0x$TGT_FIRST $TGT_STEP 0x$TGT_MAX)
+TGT_LIST2=$(seq 0x$TGT_FIRST 2 0x$TGT_MAX)
TGT_ALL="$FSNAME-OST[$TGT_FIRST-$TGT_MAX/1]"
TGT_HALF="$FSNAME-OST[$TGT_FIRST-$TGT_MAX/2]"
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=1;i<=999;i++)); 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
+ for i in $TGT_LIST; do TGT=${TGT}$(printf "%04x," $i); done
TGT="${TGT}]"
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT
[[ $? -eq 0 ]] || \
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"
create_pool_nofail $POOL
create_pool_nofail $POOL2
- local start=$((TGT_FIRST+1))
+ local start=$(printf %04x $((TGT_FIRST+1)))
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL2 \
$FSNAME-OST[$start-$TGT_MAX/2]
create_pool_nofail $POOL
create_pool_nofail $POOL2
- local start=$((TGT_FIRST+1))
+ local start=$(printf %04x $((TGT_FIRST+1)))
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL2 \
$FSNAME-OST[$start-$TGT_MAX/2]
check_dir_in_pool $POOL_ROOT/dir1 $POOL
check_dir_in_pool $POOL_ROOT/dir2 $POOL2
check_file_in_osts $POOL_ROOT/file1 "$TGT_LIST2"
- check_file_in_osts $POOL_ROOT/file2 "$(seq $start 2 $TGT_MAX)"
+ check_file_in_osts $POOL_ROOT/file2 "$(seq 0x$start 2 0x$TGT_MAX)"
echo Creating some more files
create_dir $POOL_ROOT/dir3 $POOL
check_file_in_pool $POOL_ROOT/dir1/file1 $POOL 1
check_file_in_pool $POOL_ROOT/dir1/file2 $POOL 1
create_file $POOL_ROOT/dir1/file3 $POOL 1 $((TGT_FIRST+2))
- check_file_in_osts $POOL_ROOT/dir1/file1 "$TGT_FIRST"
+ check_file_in_osts $POOL_ROOT/dir1/file1 $((16#$TGT_FIRST))
check_file_in_osts $POOL_ROOT/dir1/file2 "$((TGT_FIRST+1))"
check_file_in_osts $POOL_ROOT/dir1/file3 "$((TGT_FIRST+2))"
while [[ $i -lt $numfiles ]];
do
OST=$((OST+2))
- [[ $OST -gt $TGT_MAX ]] && OST=$TGT_FIRST
+ [[ $OST -gt $((16#$TGT_MAX)) ]] && OST=$TGT_FIRST
# echo "Iteration: $i OST: $OST"
create_file $POOL_ROOT/dir1/file${i} $POOL 1
create_pool_nofail pool${i}
local tgt=$(printf "$FSNAME-OST%04x_UUID " $i)
- add_pool pool${i} "$FSNAME-OST[$i]" "$tgt"
+ add_pool pool${i} "$FSNAME-OST[$(printf %04x $i)]" "$tgt"
create_dir $POOL_ROOT/dir${i} pool${i}
createmany -o $POOL_ROOT/dir$i/$tfile $numfiles || \
error "createmany $POOL_ROOT/dir$i/$tfile failed!"
}
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"
add_pool $POOL $TGT_HALF "$TGT_UUID2"
- local start=$((TGT_FIRST+1))
- TGT=$(for i in `seq $start 2 $TGT_MAX`; \
+ local start=$(printf %04x $((TGT_FIRST+1)))
+ TGT=$(for i in $(seq 0x$start 2 0x$TGT_MAX); \
do printf "$FSNAME-OST%04x_UUID " $i; done)
add_pool $POOL2 "$FSNAME-OST[$start-$TGT_MAX/2]" "$TGT"
do
echo "Pool $pool, iteration $c"
do_facet $SINGLEMDS lctl pool_add $FSNAME.$pool OST[$TGT_FIRST-$TGT_MAX/$step] 2>/dev/null
- local TGT_SECOND=$(($TGT_FIRST+$step))
- if [ "$TGT_SECOND" -le "$TGT_MAX" ]; then
+ local TGT_SECOND=$(printf %04x $((TGT_FIRST+$step)))
+ if [ $((16#$TGT_SECOND)) -le $((16#$TGT_MAX)) ]; then
do_facet $SINGLEMDS lctl pool_remove $FSNAME.$pool OST[$TGT_SECOND-$TGT_MAX/$step]
fi
done
create_pool_nofail $POOL
- local TGT=$(for i in `seq $TGT_FIRST 3 $TGT_MAX`; \
+ local TGT=$(for i in $(seq 0x$TGT_FIRST 3 0x$TGT_MAX); \
do printf "$FSNAME-OST%04x_UUID " $i; done)
add_pool $POOL "$FSNAME-OST[$TGT_FIRST-$TGT_MAX/3]" "$TGT"
create_dir $dir $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:" |\
wait_osc_import_state mds ost FULL
clients_up
+ wait_mds_ost_sync
# Veriy that the pool got created and is usable
- df $POOL_ROOT
- echo "Creating a file in pool$i"
- create_file $POOL_ROOT/file$i pool$i || break
- check_file_in_pool $POOL_ROOT/file$i pool$i || break
+ df $POOL_ROOT > /dev/null
+ sleep 5
+ # Make sure OST0 can be striped on
+ $SETSTRIPE -o 0 -c 1 $POOL_ROOT/$tfile
+ STR=$($GETSTRIPE $POOL_ROOT/$tfile | grep 0x | cut -f2 | tr -d " ")
+ rm $POOL_ROOT/$tfile
+ if [[ "$STR" == "0" ]]; then
+ echo "Creating a file in pool$i"
+ create_file $POOL_ROOT/file$i pool$i || break
+ check_file_in_pool $POOL_ROOT/file$i pool$i || break
+ else
+ echo "OST 0 seems to be unavailable. Try later."
+ fi
done
rm -rf $POOL_ROOT
}
run_test 25 "Create new pool and restart MDS ======================="
-log "cleanup: ======================================================"
+test_26() {
+ local OSTCOUNT=`lctl get_param -n lov.$LOVNAME.*clilov*.numobd`
+ [[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
+ set_cleanup_trap
+ local dev=$(mdsdevname ${SINGLEMDS//mds/})
+ local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+
+ mkdir -p $POOL_ROOT
+
+ create_pool_nofail $POOL
+
+ do_facet $SINGLEMDS "lctl pool_add $FSNAME.pool1 OST0000; sync"
+ wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.pool1 | \
+ sort -u | grep $FSNAME-OST0000_UUID " "$FSNAME-OST0000_UUID" || \
+ error "pool_add failed: $1; $2"
+
+ do_facet $SINGLEMDS "lctl pool_add $FSNAME.pool1 OST0002; sync"
+ wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.pool1 | \
+ sort -u | grep $FSNAME-OST0002_UUID" "$FSNAME-OST0002_UUID" || \
+ error "pool_add failed: $1; $2"
+
+ # Veriy that the pool got created and is usable
+ df $POOL_ROOT
+ echo "Creating files in $POOL"
+
+ for ((i=0;i<10;i++)); do
+ #OBD_FAIL_MDS_OSC_CREATE_FAIL 0x147
+ #Fail OST0000 to make sure the objects create on the other ost in the pool
+ do_facet $SINGLEMDS lctl set_param fail_loc=0x147
+ do_facet $SINGLEMDS lctl set_param fail_val=0
+ create_file $POOL_ROOT/file$i $POOL 1 -1 || break
+ do_facet $SINGLEMDS lctl set_param fail_loc=0
+ check_file_in_pool $POOL_ROOT/file$i $POOL || break
+ done
+ rm -rf $POOL_ROOT
+}
+run_test 26 "Choose other OSTs in the pool first in the creation remedy"
+
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