X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fost-pools.sh;h=ffa15066c0b0542ae0c3582bc964fb697e03348d;hp=0d0d99ce34c3730d99c87dd58e24164647694855;hb=6dd41a43e3cdff1b2e0713cfc163734889d8650a;hpb=b452afbebf29ad1ab4e8a9976c04fba762840e8f

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index 0d0d99c..ffa1506 100644
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
+# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 #
 # Run select tests by setting ONLY, or as arguments to the script.
 # Skip specific tests by setting EXCEPT.
 #
 # Run test by setting NOSETUP=true when ltest has setup env for us
 
-SRCDIR=`dirname $0`
+SRCDIR=$(dirname $0)
 export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
 
 ONLY=${ONLY:-"$*"}
@@ -13,8 +15,8 @@ ALWAYS_EXCEPT="$OST_POOLS_EXCEPT"
 # bug number for skipped test: -
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-[ "$ALWAYS_EXCEPT$EXCEPT" ] && \
-        echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT`"
+[ "$ALWAYS_EXCEPT$EXCEPT" ] &&
+    echo "Skipping tests: $(echo $ALWAYS_EXCEPT $EXCEPT)"
 
 TMP=${TMP:-/tmp}
 ORIG_PWD=${PWD}
@@ -23,41 +25,32 @@ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
 
 check_and_setup_lustre
 
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="23b"
+
 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}
-
-LFS=${LFS:-lfs}
-LCTL=${LCTL:-lctl}
-SETSTRIPE=${SETSTRIPE:-"$LFS setstripe"}
-GETSTRIPE=${GETSTRIPE:-"$LFS getstripe"}
-
-
-TSTUSR=${TSTUSR:-"quota_usr"}
-TSTID=${TSTID:-60000}
-RUNAS="runas -u $TSTID -g $TSTID"
+MAXFREE=${MAXFREE:-$((2000000 * OSTCOUNT))}
 
 # OST pools tests
-POOL=${POOL:-pool1}
-POOL2=${POOL2:-pool2}
-POOL3=${POOL3:-pool3}
+POOL=testpool
+POOL2=${POOL2:-${POOL}2}
+POOL3=${POOL3:-${POOL}3}
 NON_EXISTANT_POOL=nonexistantpool
 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]"
@@ -72,12 +65,12 @@ create_dir() {
     local idx=$4
 
     mkdir -p $dir
-    if [[ -n $4 ]]; then
-        $SETSTRIPE -c $count -p $pool $dir -o $idx
+    if [[ -n $idx ]]; then
+        $SETSTRIPE -c $count -p $pool -i $idx $dir
     else
         $SETSTRIPE -c $count -p $pool $dir
     fi
-    [[ $? -eq 0 ]] || \
+    [[ $? -eq 0 ]] ||
         error "$SETSTRIPE -p $pool $dir failed."
 }
 
@@ -87,17 +80,17 @@ create_file() {
     local count=${3:-"-1"}
     local index=${4:-"-1"}
     rm -f $file
-    $SETSTRIPE -o $index -c $count -p $pool $file
-    [[ $? -eq 0 ]] || \
+    $SETSTRIPE -i $index -c $count -p $pool $file
+    [[ $? -eq 0 ]] ||
         error "$SETSTRIPE -p $pool $file failed."
 }
 
 osts_in_pool() {
     local pool=$1
     local res
-    for i in $(do_facet $SINGLEMDS lctl pool_list $FSNAME.$pool | \
-        grep -v "^Pool:" | sed -e 's/_UUID$//;s/^.*-OST//'); do
-      res="$res $(printf "%d" 0x$i)"
+    for i in $(do_facet $SINGLEMDS lctl pool_list $FSNAME.$pool |
+               grep -v "^Pool:" | sed -e 's/_UUID$//;s/^.*-OST//'); do
+        res="$res $(printf "%d" 0x$i)"
     done
     echo $res
 }
@@ -105,14 +98,14 @@ osts_in_pool() {
 check_dir_in_pool() {
     local dir=$1
     local pool=$2
-    local res=$($GETSTRIPE $dir | grep "^stripe_count:" \
-        | cut -d ':' -f 5 | tr -d "[:blank:]")
-    if [[ "$res" == "$pool" ]]; then
-        return 0
-    else
+    local res=$($GETSTRIPE $dir | grep "^stripe_count:" |
+                cut -d ':' -f 5 | tr -d "[:blank:]")
+    if [[ "$res" != "$pool" ]]; then
         error found $res instead of $pool
         return 1
     fi
+
+    return 0
 }
 
 check_file_in_pool() {
@@ -126,9 +119,8 @@ check_file_in_osts() {
         local count=$3
         local res=$($GETSTRIPE $file | grep 0x | cut -f2)
         local i
-        for i in $res
-        do
-                found=$(echo :$pool_list: | tr " " ":"  | grep :$i:)
+        for i in $res; do
+                found=$(echo :$pool_list: | tr " " ":" | grep :$i:)
                 if [[ "$found" == "" ]]; then
                         echo "pool list: $pool_list"
                         echo "striping: $res"
@@ -139,16 +131,21 @@ check_file_in_osts() {
         done
 
         local ost_count=$($GETSTRIPE $file | grep 0x | wc -l)
-        [[ -n "$count" ]] && [[ $ost_count -ne $count ]] && \
-            error "Stripe count $count expected; got $ost_count"
-                
-        return 0
+        [[ -n "$count" ]] && [[ $ost_count -ne $count ]] &&
+            { error "Stripe count $count expected; got $ost_count" && return 1;}
+
+
+}
+
+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
@@ -160,70 +157,54 @@ check_file_not_in_pool() {
 check_dir_not_in_pool() {
     local dir=$1
     local pool=$2
-    local res=$($GETSTRIPE -v $dir | grep "^stripe_count" | head -1 | \
-        cut -f 8 -d ' ')
+    local res=$($GETSTRIPE -v $dir | grep "^stripe_count" | head -1 |
+                cut -f 8 -d ' ')
     if [[ "$res" == "$pool" ]]; then
         error "File $dir is in pool: $res"
         return 1
-    else
-        return 0
     fi
-}
-
-create_pool() {
-    do_facet $SINGLEMDS lctl pool_new $FSNAME.$1
-    local RC=$?
-    # get param should return err until pool is created
-    [[ $RC -ne 0 ]] && return $RC
-
-    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$1 \
-        2>/dev/null || echo foo" "" || RC=1
-    [[ $RC -ne 0 ]] && error "pool_new failed"
-    return $RC
+    return 0
 }
 
 drain_pool() {
     pool=$1
-    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$pool" ""\
-        ||error "Failed to remove targets from pool: $pool"
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$pool" "" ||
+        error "Failed to remove targets from pool: $pool"
 }
 
 add_pool() {
     local pool=$1
     local osts=$2
-    local tgt="${3}$(lctl get_param -n lov.$FSNAME-*.pools.$pool | \
-        sort -u | tr '\n' ' ')"
+    local tgt="${3}$(lctl get_param -n lov.$FSNAME-*.pools.$pool |
+               sort -u | tr '\n' ' ')"
 
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$pool $osts
     local RC=$?
     [[ $RC -ne 0 ]] && return $RC
 
-    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$pool | \
-        sort -u | tr '\n' ' ' " "$tgt" || RC=1
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$pool |
+                           sort -u | tr '\n' ' ' " "$tgt" >/dev/null || RC=1
     [[ $RC -ne 0 ]] && error "pool_add failed: $1; $2"
     return $RC
 }
 
 create_pool_nofail() {
-    create_pool $1
-    if [[ $? != 0 ]]
-    then
+    create_pool $FSNAME.$1
+    if [[ $? != 0 ]]; then
         error "Pool creation of $1 failed"
     fi
 }
 
 create_pool_fail() {
-    create_pool $1
-    if [[ $? == 0 ]]
-    then
+    create_pool $FSNAME.$1
+    if [[ $? == 0 ]]; then
         error "Pool creation of $1 succeeded; should have failed"
     fi
 }
 
 cleanup_tests() {
     # Destroy pools from previous test runs
-    for p in $(do_facet $SINGLEMDS lctl pool_list $FSNAME | \
-      grep $FSNAME.pool[0-$OSTCOUNT]); do
+    for p in $(do_facet $SINGLEMDS lctl pool_list $FSNAME | grep $POOL); do
         destroy_pool_int $p;
     done
     rm -rf $DIR/d0.${TESTSUITE}
@@ -233,322 +214,362 @@ ost_pools_init() {
     cleanup_tests
 }
 
+set_cleanup_trap() {
+    trap "cleanup_tests $FSNAME" EXIT
+}
 
 # Initialization
 remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
 remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
 ost_pools_init
 
-# Tests for new commands added
 
-test_1() {
-    echo "Creating a pool with a 1 character pool name"
+# Tests for new commands added
+test_1a() {
+    set_cleanup_trap
     create_pool_nofail p
+    destroy_pool p
+}
+run_test 1a "Create a pool with a 1 character pool name"
 
-    echo "Creating a pool with a 10 character pool name"
-    create_pool_nofail p123456789
-    destroy_pool p123456789
-
-    echo "Creating a pool with a 16 character pool name"
-    create_pool_nofail p123456789123456
-    destroy_pool p123456789123456
-
-    echo "Creating a pool with a 17 character pool name; should fail"
-    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
-
-    echo "pool_new should fail if fs-name or poolname are missing."
-    do_facet $SINGLEMDS lctl pool_new .pool1
-    [[ $? -ne 0 ]] || \
-        error "pool_new did not fail even though fs-name was missing."
-    do_facet $SINGLEMDS lctl pool_new pool1
-    [[ $? -ne 0 ]] || \
-        error "pool_new did not fail even though fs-name was missing."
-    do_facet $SINGLEMDS lctl pool_new ${FSNAME}.
-    [[ $? -ne 0 ]] || \
-        error "pool_new did not fail even though pool name was missing."
-    do_facet $SINGLEMDS lctl pool_new .
-    [[ $? -ne 0 ]] || \
-        error "pool_new did not fail even though pool name and fs-name " \
-            "were missing."
-    do_facet $SINGLEMDS lctl pool_new ${FSNAME},pool1
-    [[ $? -ne 0 ]] || \
-        error "pool_new did not fail even though pool name format was wrong"
-    do_facet $SINGLEMDS lctl pool_new ${FSNAME}/pool1
-    [[ $? -ne 0 ]] || \
+test_1b() {
+    set_cleanup_trap
+    create_pool_nofail ${POOL}12
+    destroy_pool ${POOL}12
+}
+run_test 1b "Create a pool with a 10 character pool name"
+
+test_1c() {
+    set_cleanup_trap
+    create_pool_nofail ${POOL}12345678
+    destroy_pool ${POOL}12345678
+}
+run_test 1c "Create a pool with a 16 character pool name"
+
+test_1d() {
+    set_cleanup_trap
+    create_pool_fail ${POOL}123456789
+}
+run_test 1d "Create a pool with a 17 char pool name; should fail"
+
+test_1e() {
+    set_cleanup_trap
+    local pool_name="$POOL"
+    for ((i = 1; i <= 991; i++)); do pool_name=${pool_name}"o"; done
+    create_pool_fail $pool_name
+}
+run_test 1e "Create a pool with a 1000 char pool name; should fail"
+
+test_1f() {
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_new .$POOL 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_new did not fail even though fs-name was missing"
+}
+run_test 1f "pool_new should fail if fs-name is missing"
+
+test_1g() {
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_new $POOL 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_new did not fail even though fs-name was missing"
+}
+run_test 1g "pool_new should fail if fs-name is missing"
+
+test_1h() {
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_new ${FSNAME}. 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_new did not fail even though pool name was missing"
+}
+run_test 1h "pool_new should fail if poolname is missing"
+
+test_1i() {
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_new . 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_new did not fail even if pool and fs-name were missing"
+}
+run_test 1i "pool_new should fail if poolname and fs-name are missing"
+
+test_1j() {
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_new ${FSNAME},$POOL 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "pool_new did not fail even though pool name format was wrong"
+}
+run_test 1j "pool_new should fail if poolname format is wrong"
 
-    do_facet $SINGLEMDS lctl pool_new ${FSNAME}.p
-    [[ $? -ne 0 ]] || \
-        error "pool_new did not fail even though pool1 existed"
-    destroy_pool p
+test_1k() {
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_new ${FSNAME}/$POOL 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_new did not fail even though pool name format was wrong"
+}
+run_test 1k "pool_new should fail if poolname format is wrong"
 
+test_1m() {
+    set_cleanup_trap
+    create_pool_nofail $POOL2
+    do_facet $SINGLEMDS lctl pool_new ${FSNAME}.$POOL2 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_new did not fail even though $POOL2 existed"
+    destroy_pool $POOL2
 }
-run_test 1 "Test lctl pool_new  ========================================="
+run_test 1m "pool_new did not fail even though $POOL2 existed"
 
 test_2a() {
+    set_cleanup_trap
     destroy_pool $POOL
 
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $FSNAME-OST0000
-    [[ $? -ne 0 ]] || \
-        error " pool_add did not fail even though pool did " \
-        " not exist."
+    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $FSNAME-OST0000 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_add did not fail even though $POOL did not exist"
 }
-run_test 2a "pool_add: non-existant pool"
+run_test 2a "pool_add: non-existant pool $POOL"
 
 test_2b() {
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.p1234567891234567890 \
-        $FSNAME-OST0000
-    [[ $? -ne 0 ]] || \
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_add $FSNAME.${POOL}1234567890 \
+        $FSNAME-OST0000 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "pool_add did not fail even though pool name was invalid."
 }
 run_test 2b "pool_add: Invalid pool name"
 
 # Testing various combinations of OST name list
 test_2c() {
+    set_cleanup_trap
     local TGT
     local RC
 
     lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
-    [[ $? -ne 0 ]] || \
-        destroy_pool $POOL
+    [[ $? -ne 0 ]] || destroy_pool $POOL
 
     create_pool_nofail $POOL
 
     # 1. OST0000
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL OST0000
-    RC=$?; [[ $RC -eq 0 ]] || \
+    RC=$?; [[ $RC -eq 0 ]] ||
         error "pool_add failed. $FSNAME $POOL OST0000: $RC"
     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 ]] || \
+    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 ]] || \
+    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 ]] || \
-        error "pool_add failed. $FSNAME.$POOL $TGT. $RC"
+    [[ $? -eq 0 ]] || error "pool_add failed. $FSNAME.$POOL $TGT. $RC"
     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 ]] || \
+    RC=$?; [[ $RC -eq 0 ]] ||
         error "pool_add failed. $FSNAME $POOL" "$TGT_ALL $RC"
-    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL | \
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL |
       sort -u | tr '\n' ' ' " "$TGT_UUID" || error "Add to pool failed"
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $TGT_ALL
     drain_pool $POOL
 
     destroy_pool $POOL
 }
-run_test 2c "pool_add: OST index combinations ==========================="
+run_test 2c "pool_add: OST index combinations"
 
 test_2d() {
+    set_cleanup_trap
     local TGT
     local RC
 
     lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
-    [[ $? -ne 0 ]] || \
-        destroy_pool $POOL
+    [[ $? -ne 0 ]] || destroy_pool $POOL
 
     create_pool_nofail $POOL
 
     TGT=$(printf "$FSNAME-OST%04x_UUID " $OSTCOUNT)
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT
-    RC=$?; [[ $RC -ne 0 ]] || \
+    RC=$?; [[ $RC -ne 0 ]] ||
         error "pool_add succeeded for an OST ($TGT) that does not exist."
 
     destroy_pool $POOL
 }
-run_test 2d "pool_add: OSTs that don't exist should be rejected ========"
+run_test 2d "pool_add: OSTs that don't exist should be rejected"
 
 test_2e() {
+    set_cleanup_trap
     local TGT
     local RC
     local RESULT
 
     $LCTL get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
-    [[ $? -ne 0 ]] || \
-        destroy_pool $POOL
+    [[ $? -ne 0 ]] || destroy_pool $POOL
 
     create_pool_nofail $POOL
 
     TGT="$FSNAME-OST0000_UUID "
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT
-    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL | \
-      sort -u | tr '\n' ' ' " "$TGT" || error "Add to pool failed"
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL |
+        sort -u | tr '\n' ' ' " "$TGT" || error "Add to pool failed"
     RESULT=$(do_facet $SINGLEMDS \
-        "LOCALE=C $LCTL pool_add $FSNAME.$POOL $TGT 2>&1")
+             "LOCALE=C $LCTL pool_add $FSNAME.$POOL $TGT 2>&1")
     RC=$?
     echo $RESULT
 
-    [[ $RC -ne 0 ]] || \
+    [[ $RC -ne 0 ]] ||
         error "pool_add succeeded for an OST that was already in the pool."
 
-    [[ $(grep "already in pool" <<< $RESULT) ]] || \
+    [[ $(grep "already in pool" <<< $RESULT) ]] ||
         error "pool_add failed as expected but error message not as expected."
 
     destroy_pool $POOL
 }
-run_test 2e "pool_add: OST already in a pool should be rejected ========"
+run_test 2e "pool_add: OST already in a pool should be rejected"
 
 test_3a() {
+    set_cleanup_trap
     lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
-    [[ $? -ne 0 ]] || \
-        destroy_pool $POOL
+    [[ $? -ne 0 ]] || destroy_pool $POOL
 
-    do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000
-    [[ $? -ne 0 ]] || \
-        error "pool_remove did not fail even though" \
-        "pool did not exist."
+    do_facet $SINGLEMDS \
+        lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_remove did not fail even though pool did not exist."
 }
 run_test 3a "pool_remove: non-existant pool"
 
 test_3b() {
-    do_facet $SINGLEMDS lctl pool_remove ${NON_EXISTANT_FS}.$POOL OST0000
-    [[ $? -ne 0 ]] || \
+    set_cleanup_trap
+    do_facet $SINGLEMDS \
+        lctl pool_remove ${NON_EXISTANT_FS}.$POOL OST0000 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "pool_remove did not fail even though fsname did not exist."
 }
 run_test 3b "pool_remove: non-existant fsname"
 
 test_3c() {
+    set_cleanup_trap
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.p1234567891234567890 \
-        $FSNAME-OST0000
-    [[ $? -ne 0 ]] || \
+        $FSNAME-OST0000 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "pool_remove did not fail even though pool name was invalid."
 }
 run_test 3c "pool_remove: Invalid pool name"
 
-
 # Testing various combinations of OST name list
 test_3d() {
+    set_cleanup_trap
     lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
-    [[ $? -ne 0 ]] || \
-        destroy_pool $POOL
+    [[ $? -ne 0 ]] || destroy_pool $POOL
 
     create_pool_nofail $POOL
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL OST0000
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL OST0000
-    [[ $? -eq 0 ]] || \
-        error "pool_remove failed. $FSNAME $POOL OST0000"
+    [[ $? -eq 0 ]] || error "pool_remove failed. $FSNAME $POOL OST0000"
     drain_pool $POOL
 
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $FSNAME-OST0000
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000
-    [[ $? -eq 0 ]] || \
-        error "pool_remove failed. $FSNAME $POOL $FSNAME-OST0000"
+    [[ $? -eq 0 ]] || error "pool_remove failed. $FSNAME $POOL $FSNAME-OST0000"
     drain_pool $POOL
 
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $FSNAME-OST0000_UUID
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000_UUID
-    [[ $? -eq 0 ]] || \
+    [[ $? -eq 0 ]] ||
         error "pool_remove failed. $FSNAME $POOL $FSNAME-OST0000_UUID"
     drain_pool $POOL
 
     add_pool $POOL $TGT_ALL "$TGT_UUID"
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $TGT_ALL
-    [[ $? -eq 0 ]] || \
-        error "pool_remove failed. $FSNAME $POOL" $TGT_ALL
+    [[ $? -eq 0 ]] || error "pool_remove failed. $FSNAME $POOL" $TGT_ALL
     drain_pool $POOL
 
     destroy_pool $POOL
 }
-run_test 3d "pool_remove: OST index combinations ==========================="
+run_test 3d "pool_remove: OST index combinations"
 
 test_4a() {
+    set_cleanup_trap
     lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
-    [[ $? -ne 0 ]] || \
-        destroy_pool $POOL
+    [[ $? -ne 0 ]] || destroy_pool $POOL
 
-    do_facet $SINGLEMDS lctl pool_destroy $FSNAME.$POOL
-    [[ $? -ne 0 ]] || \
+    do_facet $SINGLEMDS lctl pool_destroy $FSNAME.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "pool_destroy did not fail even though pool did not exist."
 }
 run_test 4a "pool_destroy: non-existant pool"
 
 test_4b() {
-    do_facet $SINGLEMDS lctl pool_destroy ${NON_EXISTANT_FS}.$POOL
-    [[ $? -ne 0 ]] || \
-        error "pool_destroy did not fail even though the filesystem did not exist."
+    set_cleanup_trap
+    do_facet $SINGLEMDS lctl pool_destroy ${NON_EXISTANT_FS}.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] ||
+        error "pool_destroy did not fail even though filesystem did not exist."
 }
 run_test 4b "pool_destroy: non-existant fs-name"
 
 test_4c() {
+    set_cleanup_trap
     create_pool_nofail $POOL
     add_pool $POOL "OST0000" "$FSNAME-OST0000_UUID "
 
     do_facet $SINGLEMDS lctl pool_destroy ${FSNAME}.$POOL
-    [[ $? -ne 0 ]] || \
-        error "pool_destroy succeeded with a non-empty pool name."
+    [[ $? -ne 0 ]] || error "pool_destroy succeeded with a non-empty pool."
     destroy_pool $POOL
 }
-run_test 4c "pool_destroy: non-empty pool ==============================="
+run_test 4c "pool_destroy: non-empty pool"
 
 sub_test_5() {
     local LCMD=$1
 
-    $LCMD pool_list
-    [[ $? -ne 0 ]] || \
-        error "pool_list did not fail even though fsname was not mentioned."
+    $LCMD pool_list 2>/dev/null
+    [[ $? -ne 0 ]] || error "pool_list did not fail even though fsname missing."
 
-    destroy_pool $POOL
-    destroy_pool $POOL2
+    destroy_pool $POOL 2>/dev/null
+    destroy_pool $POOL2 2>/dev/null
 
     create_pool_nofail $POOL
     create_pool_nofail $POOL2
     $LCMD pool_list $FSNAME
-    [[ $? -eq 0 ]] || \
-        error "pool_list $FSNAME failed."
+    [[ $? -eq 0 ]] || error "pool_list $FSNAME failed."
 
     do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT_ALL
 
     $LCMD pool_list $FSNAME.$POOL
-    [[ $? -eq 0 ]] || \
-        error "pool_list $FSNAME.$POOL failed."
+    [[ $? -eq 0 ]] || error "pool_list $FSNAME.$POOL failed."
 
-    $LCMD pool_list ${NON_EXISTANT_FS}
-    [[ $? -ne 0 ]] || \
-        error "pool_list did not fail for a non-existant fsname $NON_EXISTANT_FS"
+    $LCMD pool_list ${NON_EXISTANT_FS} 2>/dev/null
+    [[ $? -ne 0 ]] || error "pool_list did not fail for fsname $NON_EXISTANT_FS"
 
-    $LCMD pool_list ${FSNAME}.$NON_EXISTANT_POOL
-    [[ $? -ne 0 ]] || \
-        error "pool_list did not fail for a non-existant pool $NON_EXISTANT_POOL"
+    $LCMD pool_list ${FSNAME}.$NON_EXISTANT_POOL 2>/dev/null
+    [[ $? -ne 0 ]] || error "pool_list did not fail for pool $NON_EXISTANT_POOL"
 
     if [[ ! $(grep $SINGLEMDS <<< $LCMD) ]]; then
         echo $LCMD pool_list $DIR
         $LCMD pool_list $DIR
-        [[ $? -eq 0 ]] || \
-            error "pool_list failed for $DIR"
+        [[ $? -eq 0 ]] || error "pool_list failed for $DIR"
 
         mkdir -p ${DIR}/d1
         $LCMD pool_list ${DIR}/d1
-        [[ $? -eq 0 ]] || \
-            error "pool_list failed for ${DIR}/d1"
+        [[ $? -eq 0 ]] || error "pool_list failed for ${DIR}/d1"
     fi
 
     rm -rf ${DIR}nonexistant
-    $LCMD pool_list ${DIR}nonexistant
-    [[ $? -ne 0 ]] || \
+    $LCMD pool_list ${DIR}nonexistant 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "pool_list did not fail for invalid mountpoint ${DIR}nonexistant"
 
     destroy_pool $POOL
@@ -556,6 +577,7 @@ sub_test_5() {
 }
 
 test_5() {
+    set_cleanup_trap
     # Issue commands from client
     sub_test_5 $LCTL
     sub_test_5 $LFS
@@ -568,6 +590,7 @@ test_5() {
 run_test 5 "lfs/lctl pool_list"
 
 test_6() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local POOL_DIR=$POOL_ROOT/dir_tst
     local POOL_FILE=$POOL_ROOT/file_tst
@@ -575,76 +598,69 @@ test_6() {
     create_pool_nofail $POOL
 
     do_facet $SINGLEMDS lctl pool_list $FSNAME
-    [[ $? -eq 0 ]] || \
-        error "pool_list $FSNAME failed."
+    [[ $? -eq 0 ]] || error "pool_list $FSNAME failed."
 
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT_ALL
+    add_pool $POOL $TGT_ALL "$TGT_UUID"
 
     mkdir -p $POOL_DIR
     $SETSTRIPE -c -1 -p $POOL $POOL_DIR
-    [[ $? -eq 0 ]] || \
-        error "$SETSTRIPE -p $POOL failed."
+    [[ $? -eq 0 ]] || error "$SETSTRIPE -p $POOL failed."
     check_dir_in_pool $POOL_DIR $POOL
 
     # If an invalid pool name is specified, the command should fail
-    $SETSTRIPE -c 2 -p $INVALID_POOL $POOL_DIR
-    [[ $? -ne 0 ]] || \
-        error_ignore 19919 "setstripe to invalid pool did not fail."
+    $SETSTRIPE -c 2 -p $INVALID_POOL $POOL_DIR 2>/dev/null
+    [[ $? -ne 0 ]] || error "setstripe to invalid pool did not fail."
 
     # If the pool name does not exist, the command should fail
-    $SETSTRIPE -c 2 -p $NON_EXISTANT_POOL $POOL_DIR
-    [[ $? -ne 0 ]] || \
-        error_ignore 19919 "setstripe to non-existant pool did not fail."
+    $SETSTRIPE -c 2 -p $NON_EXISTANT_POOL $POOL_DIR 2>/dev/null
+    [[ $? -ne 0 ]] || error "setstripe to non-existant pool did not fail."
 
     # lfs setstripe should work as before if a pool name is not specified.
     $SETSTRIPE -c -1 $POOL_DIR
-    [[ $? -eq 0 ]] || \
-        error "$SETSTRIPE -p $POOL_DIR failed."
+    [[ $? -eq 0 ]] || error "$SETSTRIPE -p $POOL_DIR failed."
     $SETSTRIPE -c -1 $POOL_FILE
-    [[ $? -eq 0 ]] || \
-        error "$SETSTRIPE -p $POOL_FILE failed."
+    [[ $? -eq 0 ]] || error "$SETSTRIPE -p $POOL_FILE failed."
 
     # lfs setstripe should fail if a start index that is outside the
     # pool is specified.
     create_pool_nofail $POOL2
     add_pool $POOL2 "OST0000" "$FSNAME-OST0000_UUID "
-    $SETSTRIPE -o 1 -p $POOL2 $ROOT_POOL/$tfile
-    [[ $? -ne 0 ]] || \
+    $SETSTRIPE -i 1 -p $POOL2 $ROOT_POOL/$tfile 2>/dev/null
+    [[ $? -ne 0 ]] ||
         error "$SETSTRIPE with start index outside the pool did not fail."
 
-    destroy_pool $POOL
-    destroy_pool $POOL2
 }
 run_test 6 "getstripe/setstripe"
 
 test_11() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
-    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+    [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
 
     create_pool_nofail $POOL
     create_pool_nofail $POOL2
 
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL \
-        $FSNAME-OST[$TGT_FIRST-$TGT_MAX/2]
-    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]
 
+    add_pool $POOL $TGT_HALF "$TGT_UUID2"
+
     create_dir $POOL_ROOT/dir1  $POOL
     create_dir $POOL_ROOT/dir2  $POOL2
     check_dir_in_pool $POOL_ROOT/dir1 $POOL
     check_dir_in_pool $POOL_ROOT/dir1 $POOL
 
     local numfiles=100
-    createmany -o $POOL_ROOT/dir1/$tfile $numfiles || \
+    createmany -o $POOL_ROOT/dir1/$tfile $numfiles ||
         error "createmany $POOL_ROOT/dir1/$tfile failed!"
 
     for file in $POOL_ROOT/dir1/*; do
         check_file_in_pool $file $POOL
     done
 
-    createmany -o $POOL_ROOT/dir2/$tfile $numfiles || \
+    createmany -o $POOL_ROOT/dir2/$tfile $numfiles ||
         error "createmany $POOL_ROOT/dir2/$tfile failed!"
     for file in $POOL_ROOT/dir2/*; do
         check_file_in_pool $file $POOL2
@@ -652,27 +668,25 @@ test_11() {
 
     rm -rf $POOL_ROOT/dir?
 
-    destroy_pool $POOL
-    destroy_pool $POOL2
-
     return 0
 }
 run_test 11 "OSTs in overlapping/multiple pools"
 
 test_12() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
-    [[ $OSTCOUNT -le 2 ]] && skip "Need atleast 3 OSTs" && return
+    [[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
 
     create_pool_nofail $POOL
     create_pool_nofail $POOL2
 
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL \
-        $FSNAME-OST[$TGT_FIRST-$TGT_MAX/2]
-    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]
 
+    add_pool $POOL $TGT_HALF "$TGT_UUID2"
+
     echo creating some files in $POOL and $POOL2
 
     create_dir $POOL_ROOT/dir1  $POOL
@@ -689,105 +703,104 @@ test_12() {
     echo Changing the pool membership
     do_facet $SINGLEMDS lctl pool_remove $FSNAME.$POOL $FSNAME-OST[$TGT_FIRST]
     do_facet $SINGLEMDS lctl pool_list $FSNAME.$POOL
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL2 $FSNAME-OST[$TGT_FIRST]
+    FIRST_UUID=$(echo $TGT_UUID | awk '{print $1}')
+    add_pool $POOL2 $FSNAME-OST[$TGT_FIRST] "$FIRST_UUID "
     do_facet $SINGLEMDS lctl pool_list $FSNAME.$POOL2
 
-    echo Checking the files again    
+    echo Checking the files again
     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/file1 "$TGT_LIST2"
+    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
-    create_dir $POOL_ROOT/dir4 POOL2
+    create_dir $POOL_ROOT/dir4 $POOL2
     create_file $POOL_ROOT/file3 $POOL
     create_file $POOL_ROOT/file4 $POOL2
 
-    echo Checking the new files 
+    echo Checking the new files
     check_file_in_pool $POOL_ROOT/file3 $POOL
     check_file_in_pool $POOL_ROOT/file4 $POOL2
 
-    destroy_pool $POOL
-    destroy_pool $POOL2
-
-    return 0    
+    return 0
 }
 run_test 12 "OST Pool Membership"
 
 test_13() {
-    [[ $OSTCOUNT -le 2 ]] && skip "Need atleast 3 OSTs" && return
+    set_cleanup_trap
+    [[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
 
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=10
     local count=3
 
     create_pool_nofail $POOL
-    do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL $TGT_ALL
+    add_pool $POOL $TGT_ALL "$TGT_UUID"
 
     create_dir $POOL_ROOT/dir1 $POOL -1
-    createmany -o $POOL_ROOT/dir1/$tfile $numfiles || \
+    createmany -o $POOL_ROOT/dir1/$tfile $numfiles ||
         error "createmany $POOL_ROOT/dir1/$tfile failed!"
     for file in $POOL_ROOT/dir1/*; do
         check_file_in_pool $file $POOL $OSTCOUNT
     done
 
     create_file $POOL_ROOT/dir1/file1 $POOL 1 $TGT_FIRST
-    create_file $POOL_ROOT/dir1/file2 $POOL 1 $((TGT_FIRST+1))
-    create_file $POOL_ROOT/dir1/file3 $POOL 1 $((TGT_FIRST+2))
+    create_file $POOL_ROOT/dir1/file2 $POOL 1 $((TGT_FIRST + 1))
+    create_file $POOL_ROOT/dir1/file3 $POOL 1 $((TGT_FIRST + 2))
     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/file2 "$((TGT_FIRST+1))"
-    check_file_in_osts $POOL_ROOT/dir1/file3 "$((TGT_FIRST+2))"
+    create_file $POOL_ROOT/dir1/file3 $POOL 1 $((TGT_FIRST + 2))
+    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))"
 
     create_dir $POOL_ROOT/dir2 $POOL $count
-    createmany -o $POOL_ROOT/dir2/$tfile $numfiles || \
-        error "createmany $POOL_ROOT/dir2/$tfile failed!"
+    createmany -o $POOL_ROOT/dir2/$tfile- $numfiles ||
+        error "createmany $POOL_ROOT/dir2/$tfile- failed!"
     for file in $POOL_ROOT/dir2/*; do
         check_file_in_pool $file $POOL $count
     done
 
-    create_dir $POOL_ROOT/dir3 $POOL $count $((TGT_FIRST+1))
-    createmany -o $POOL_ROOT/dir3/$tfile_ $numfiles || \
-        error "createmany $POOL_ROOT/dir3/$tfile_ failed!"
+    create_dir $POOL_ROOT/dir3 $POOL $count $((TGT_FIRST + 1))
+    createmany -o $POOL_ROOT/dir3/$tfile- $numfiles ||
+        error "createmany $POOL_ROOT/dir3/$tfile- failed!"
     for file in $POOL_ROOT/dir3/*; do
         check_file_in_pool $file $POOL $count
     done
 
     create_dir $POOL_ROOT/dir4 $POOL 1
-    createmany -o $POOL_ROOT/dir4/$tfile_ $numfiles || \
-        error "createmany $POOL_ROOT/dir4/$tfile_ failed!"
+    createmany -o $POOL_ROOT/dir4/$tfile- $numfiles ||
+        error "createmany $POOL_ROOT/dir4/$tfile- failed!"
     for file in $POOL_ROOT/dir4/*; do
         check_file_in_pool $file $POOL 1
     done
 
-    create_dir $POOL_ROOT/dir5 $POOL 1 $((TGT_FIRST+2))
-    createmany -o $POOL_ROOT/dir5/$tfile_ $numfiles || \
-        error "createmany $POOL_ROOT/dir5/$tfile_ failed!"
+    create_dir $POOL_ROOT/dir5 $POOL 1 $((TGT_FIRST + 2))
+    createmany -o $POOL_ROOT/dir5/$tfile- $numfiles ||
+        error "createmany $POOL_ROOT/dir5/$tfile- failed!"
     for file in $POOL_ROOT/dir5/*; do
         check_file_in_pool $file $POOL 1
-        check_file_in_osts  $file "$((TGT_FIRST+2))"
+        check_file_in_osts  $file "$((TGT_FIRST + 2))"
     done
 
-    rm -rf create_dir $POOL_ROOT/dir?
-    destroy_pool $POOL
+    rm -rf $POOL_ROOT/dir[1-5]/
 
     return 0
 }
 run_test 13 "Striping characteristics in a pool"
 
 test_14() {
-    [[ $OSTCOUNT -le 2 ]] && skip "Need atleast 3 OSTs" && return
+    set_cleanup_trap
+    [[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
 
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=100
     local i
 
-    # Create a new filesystem that is guaranteed to be balanced.
-    formatall
-    setupall
+    [ $OSTSIZE -gt $((MAXFREE / OSTCOUNT)) ] &&
+        skip_env "OST size $OSTSIZE is larger than $((MAXFREE / OSTCOUNT))" &&
+			return 0
 
     create_pool_nofail $POOL
     create_pool_nofail $POOL2
@@ -797,77 +810,68 @@ test_14() {
 
     create_dir $POOL_ROOT/dir1 $POOL 1
     create_file $POOL_ROOT/dir1/file $POOL 1
-    local OST=$($GETSTRIPE $POOL_ROOT/dir1/file | grep 0x | cut -f2)    
+    local OST=$($GETSTRIPE -i $POOL_ROOT/dir1/file)
     i=0
-    while [[ $i -lt $numfiles ]];
-    do
-        OST=$((OST+2))
-        [[ $OST -gt $TGT_MAX ]] && OST=$TGT_FIRST
+    while [[ $i -lt $numfiles ]]; do
+        OST=$((OST + 2))
+        [[ $OST -gt $((16#$TGT_MAX)) ]] && OST=$TGT_FIRST
 
         # echo "Iteration: $i OST: $OST"
         create_file $POOL_ROOT/dir1/file${i} $POOL 1
-        check_file_in_osts $POOL_ROOT/dir1/file${i} $OST
-        i=$((i+1))
+        check_file_in_pool $POOL_ROOT/dir1/file${i} $POOL
+        i=$((i + 1))
     done
 
-    # Fill OST $TGT_FIRST with 10M files
+    # Fill up OST0 until it is nearly full.
+    # Create 9 files of size OST0_SIZE/10 each.
     create_dir $POOL_ROOT/dir2 $POOL2 1
-    RC=0
-    i=0
-    while [[ $RC -eq 0 ]];
-    do
-      dd if=/dev/zero of=$POOL_ROOT/dir2/f${i} bs=1k count=$((1024*10))
-      RC=$?
-      i=$((i+1))
+    $LFS df $POOL_ROOT/dir2
+    OST0_SIZE=$($LFS df $POOL_ROOT/dir2 | awk '/\[OST:0\]/ { print $4 }')
+    FILE_SIZE=$((OST0_SIZE/1024/10))
+    echo "Filling OST0 with 9 files of ${FILE_SIZE}MB in $POOL_ROOT/dir2"
+    i=1
+    while [[ $i -lt 10 ]]; do
+        dd if=/dev/zero of=$POOL_ROOT/dir2/f${i} bs=1M count=$FILE_SIZE
+        i=$((i + 1))
     done
-
-    # Leave some space on the OST
-    rm -f $POOL_ROOT/dir2/f0
-    df -h /mnt/ost?
+    sleep 1 # get new statfs info
+    $LFS df $POOL_ROOT/dir2
 
     # OST $TGT_FIRST is no longer favored; but it may still be used.
     create_dir $POOL_ROOT/dir3 $POOL 1
     create_file $POOL_ROOT/dir3/file $POOL 1
-    createmany -o $POOL_ROOT/dir3/$tfile_ $numfiles || \
-        error "createmany $POOL_ROOT/dir3/$tfile_ failed!"
+    createmany -o $POOL_ROOT/dir3/$tfile- $numfiles ||
+        error "createmany $POOL_ROOT/dir3/$tfile- failed!"
     for file in $POOL_ROOT/dir3/*; do
         check_file_in_pool $file $POOL
     done
 
     rm -rf $POOL_ROOT
-    destroy_pool $POOL
-    destroy_pool $POOL2
+
     return 0
 }
 run_test 14 "Round robin and QOS striping within a pool"
 
 test_15() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=100
     local i=0
 
-    while [[ $i -lt $OSTCOUNT ]]
-    do
-      create_pool_nofail pool${i}
-
-      local tgt=$(printf "$FSNAME-OST%04x_UUID " $i)
-      add_pool pool${i} "$FSNAME-OST[$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!"
+    while [[ $i -lt $OSTCOUNT ]]; do
+        create_pool_nofail $POOL${i}
 
-      for file in $POOL_ROOT/dir$i/*; do
-          check_file_in_osts $file $i
-      done
+        local tgt=$(printf "$FSNAME-OST%04x_UUID " $i)
+        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!"
 
-      i=$((i+1))
-    done
+        for file in $POOL_ROOT/dir$i/*; do
+            check_file_in_osts $file $i
+        done
 
-    i=0
-    while [[ $i -lt $OSTCOUNT ]]
-    do
-      destroy_pool pool${i}
-      i=$((i+1))
+        i=$((i + 1))
     done
 
     return 0
@@ -875,6 +879,7 @@ test_15() {
 run_test 15 "One directory per OST/pool"
 
 test_16() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=10
     local i=0
@@ -891,8 +896,8 @@ test_16() {
     done
     mkdir -p $dir
 
-    createmany -o $dir/$tfile $numfiles || \
-          error "createmany $dir/$tfile failed!"
+    createmany -o $dir/$tfile $numfiles ||
+        error "createmany $dir/$tfile failed!"
 
     for file in $dir/*; do
         check_file_in_pool $file $POOL
@@ -900,13 +905,12 @@ test_16() {
 
     rm -rf $POOL_ROOT/$tdir
 
-    destroy_pool $POOL
-
     return 0
 }
 run_test 16 "Inheritance of pool properties"
 
 test_17() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=10
     local i=0
@@ -918,8 +922,8 @@ test_17() {
     local dir=$POOL_ROOT/dir
     create_dir $dir $POOL
 
-    createmany -o $dir/${tfile}1_ $numfiles || \
-          error "createmany $dir/${tfile}1_ failed!"
+    createmany -o $dir/${tfile}1_ $numfiles ||
+        error "createmany $dir/${tfile}1_ failed!"
 
     for file in $dir/*; do
         check_file_in_pool $file $POOL
@@ -927,7 +931,7 @@ test_17() {
 
     destroy_pool $POOL
 
-    createmany -o $dir/${tfile}2_ $numfiles || \
+    createmany -o $dir/${tfile}2_ $numfiles ||
           error "createmany $dir/${tfile}2_ failed!"
 
     rm -rf $dir
@@ -935,72 +939,81 @@ test_17() {
 }
 run_test 17 "Referencing an empty pool"
 
-create_perf_one() {
-    local dir=$1/d
-    local numfiles=$2
+create_perf() {
+    local cdir=$1/d
+    local numsec=$2
     local time
 
-    mkdir -p $dir
-    sync; sleep 5 # give pending IO a chance to go to disk
-    stat=$(createmany -o $dir/${tfile} $numfiles)
-    rm -rf $dir
+    mkdir -p $cdir
+    sync
+    wait_delete_completed >/dev/null # give pending IO a chance to go to disk
+    stat=$(createmany -o $cdir/${tfile} -$numsec | tail -1)
+    files=$(echo $stat | cut -f 2 -d ' ')
+    echo $stat 1>&2
+    unlinkmany $cdir/${tfile} $files > /dev/null
     sync
-    time=$(echo $stat | cut -f 5 -d ' ')
-    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"
+    echo $files
 }
 
 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 numsec=15
+    local iter=3
+    local plaindir=$POOL_ROOT/plaindir
+    local pooldir=$POOL_ROOT/pooldir
+    local f1=0
+    local f2=0
+    local f3=0
     local diff
 
-    time1=$(create_perf $dir $numfiles)
+    for i in $(seq 1 $iter); do
+        echo "Create performance, iteration $i, $numsec seconds x 3"
 
-    create_pool_nofail $POOL
+        files1=$(create_perf $plaindir $numsec)
+        echo "iter $i: $files1 creates without pool"
+        f1=$(($f1 + $files1))
 
-    add_pool $POOL $TGT_ALL "$TGT_UUID"
+        create_pool_nofail $POOL > /dev/null
+        add_pool $POOL $TGT_ALL "$TGT_UUID" > /dev/null
+        create_dir $pooldir $POOL
+        files2=$(create_perf $pooldir $numsec)
+        echo "iter $i: $files2 creates with pool"
+        f2=$(($f2 + $files2))
 
-    create_dir $dir $POOL
-    time2=$(create_perf $dir $numfiles)
+        destroy_pool $POOL > /dev/null
+        files3=$(create_perf $pooldir $numsec)
+        echo "iter $i: $files3 creates with missing pool"
+        f3=$(($f3 + $files3))
 
-    destroy_pool $POOL
+        echo
+    done
 
-    time3=$(create_perf $dir $numfiles)
+    echo Avg files created in $numsec seconds without pool: $((files1 / iter))
+    echo Avg files created in $numsec seconds with pool: $((files2 / iter))
+    echo Avg files created in $numsec seconds missing pool: $((files3 / iter))
 
-    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
+    # Set this high until we establish a baseline for what the degradation
+    # is / should be
+    max=30
+    diff=$((($files1 - $files2) * 100 / $files1))
+    echo  "No pool / wide pool: $diff %."
+    [ $diff -gt $max ] &&
+        error_ignore 23408 "Degradation with wide pool is $diff% > $max%"
 
-    deg=$(echo "scale=2; (($time2 - $time3) * 100 / $time3) > 5" | bc)
-    diff=$(echo "scale=2; ($time2 - $time3) * 100 / $time3" | bc)
+    max=30
+    diff=$((($files1 - $files3) * 100 / $files1))
+    echo  "No pool / missing pool: $diff %."
+    [ $diff -gt $max ] &&
+        error_ignore 23408 "Degradation with wide 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"
 
-
 test_19() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=12
     local dir1=$POOL_ROOT/dir1
@@ -1012,27 +1025,27 @@ test_19() {
     add_pool $POOL $TGT_HALF "$TGT_UUID2"
 
     create_dir $dir1 $POOL
-    createmany -o $dir1/${tfile} $numfiles || \
+    createmany -o $dir1/${tfile} $numfiles ||
           error "createmany $dir1/${tfile} failed!"
     for file in $dir1/*; do
         check_file_in_pool $file $POOL
     done
 
     mkdir -p $dir2
-    createmany -o $dir2/${tfile} $numfiles || \
+    createmany -o $dir2/${tfile} $numfiles ||
           error "createmany $dir2/${tfile} failed!"
     for file in $dir2/*; do
         check_file_not_in_pool $file $POOL
     done
 
     rm -rf $dir1 $dir2
-    destroy_pool $POOL
 
     return 0
 }
 run_test 19 "Pools should not come into play when not specified"
 
 test_20() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
     local numfiles=12
     local dir1=$POOL_ROOT/dir1
@@ -1046,9 +1059,9 @@ test_20() {
 
     add_pool $POOL $TGT_HALF "$TGT_UUID2"
 
-    local start=$((TGT_FIRST+1))
-    TGT=$(for i in `seq $start 2 $TGT_MAX`; \
-        do printf "$FSNAME-OST%04x_UUID " $i; done)
+    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"
 
     create_dir $dir1 $POOL
@@ -1073,16 +1086,15 @@ test_20() {
     check_file_not_in_pool $dir2/file4 $POOL2
 
     rm -rf $dir1
-    destroy_pool $POOL
-    destroy_pool $POOL2
 
     return 0
 }
 run_test 20 "Different pools in a directory hierarchy."
 
 test_21() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+    [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
 
     local numfiles=12
     local i=0
@@ -1098,7 +1110,6 @@ test_21() {
     check_file_in_pool $dir/file1 $POOL
 
     rm -rf $dir
-    destroy_pool $POOL
 
     return 0
 }
@@ -1110,113 +1121,198 @@ add_loop() {
 
     echo loop for $pool
 
-    for c in $(seq 1 10);
-    do
+    for c in $(seq 1 10); do
         echo "Pool $pool, iteration $c"
-        create_pool_nofail $pool
-        local TGT=$(for i in `seq $TGT_FIRST $step $TGT_MAX`; \
-            do printf "$FSNAME-OST%04x_UUID " $i; done)
-        add_pool $pool "$FSNAME-OST[$TGT_FIRST-$TGT_MAX/$step]" "$TGT"
-        destroy_pool $pool
-        do_facet $SINGLEMDS lctl pool_list $FSNAME
+        do_facet $SINGLEMDS lctl pool_add $FSNAME.$pool \
+            OST[$TGT_FIRST-$TGT_MAX/$step] 2>/dev/null
+        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
     echo loop for $pool complete
 }
 
 test_22() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+    [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
 
     local numfiles=100
 
+    create_pool_nofail $POOL
+    add_pool $POOL "OST0000" "$FSNAME-OST0000_UUID "
+    create_pool_nofail $POOL2
+    add_pool $POOL2 "OST0000" "$FSNAME-OST0000_UUID "
+
     add_loop $POOL 1 &
     add_loop $POOL2 2 &
     sleep 5
     create_dir $POOL_ROOT $POOL
-    createmany -o $POOL_ROOT/${tfile} $numfiles || \
-          error "createmany $POOL_ROOT/${tfile} failed!"
+    createmany -o $POOL_ROOT/${tfile} $numfiles ||
+        error "createmany $POOL_ROOT/${tfile} failed!"
     wait
 
     return 0
 }
 run_test 22 "Simultaneous manipulation of a pool"
 
-test_23() {
+test_23a() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+    [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
 
     mkdir -p $POOL_ROOT
-    check_runas_id $TSTID $TSTID $RUNAS  || {
-        skip "User $RUNAS_ID does not exist - skipping"
+    check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS || {
+        skip_env "User $RUNAS_ID does not exist - skipping"
         return 0
     }
 
-    local numfiles=12
     local i=0
     local TGT
-    local LIMIT=1024
+    local BUNIT_SZ=1024  # min block quota unit(kB)
+    local LIMIT=$((BUNIT_SZ * (OSTCOUNT + 1)))
     local dir=$POOL_ROOT/dir
-    local file1="$dir/$tfile-quota1"
-    local file2="$dir/$tfile-quota2"
+    local file="$dir/$tfile-quota"
 
     create_pool_nofail $POOL
 
-    local TGT=$(for i in `seq $TGT_FIRST 3 $TGT_MAX`; \
-        do printf "$FSNAME-OST%04x_UUID " $i; done)
+    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
 
-    $LFS quotaoff -ug $MOUNT
-    $LFS quotacheck -ug $MOUNT
-    $LFS setquota -u $TSTUSR -b $LIMIT -B $LIMIT $dir #-i 5 -I 5 $dir
+	# XXX remove the interoperability code once we drop the old server
+	#     ( < 2.3.50) support.
+	if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ]; then
+		$LFS quotaoff -ug $MOUNT
+		$LFS quotacheck -ug $MOUNT
+	else
+		do_facet mgs $LCTL conf_param $FSNAME.quota.ost=ug
+		sleep 5
+	fi
+
+    $LFS setquota -u $RUNAS_ID -b $LIMIT -B $LIMIT $dir
+    sleep 3
+    $LFS quota -v -u $RUNAS_ID $dir
+
+    $SETSTRIPE -c 1 -p $POOL $file
+    chown $RUNAS_ID.$RUNAS_GID $file
+    ls -l $file
+
+    # This does two "dd" runs to ensure that the quota failure is returned
+    # to userspace when we check.  The first "dd" might otherwise complete
+    # without error if it is only writing into cache.
+    stat=$(LOCALE=C $RUNAS dd if=/dev/zero of=$file bs=$BUNIT_SZ \
+           count=$((BUNIT_SZ*2)) 2>&1)
+    echo $stat | grep "Disk quota exceeded" > /dev/null
+    if [ $? -eq 0 ]; then
+        $LFS quota -v -u $RUNAS_ID $dir
+        cancel_lru_locks osc
+        stat=$(LOCALE=C $RUNAS dd if=/dev/zero of=$file bs=$BUNIT_SZ \
+               count=$BUNIT_SZ seek=$((BUNIT_SZ*2)) 2>&1)
+        RC=$?
+        echo $stat
+        [[ $RC -eq 0 ]] && error "second dd did not fail."
+        echo $stat | grep "Disk quota exceeded" > /dev/null
+        [[ $? -eq 1 ]] && error "second dd did not fail with EDQUOT."
+    else
+        log "first dd failed with EDQUOT."
+    fi
+    $LFS quota -v -u $RUNAS_ID $dir
+}
+run_test 23a "OST pools and quota"
 
-    $LFS setstripe $file1 -c 1 -p $POOL
-    chown $TSTUSR.$TSTUSR $file1
-    ls -l $file1
-    type runas
+test_23b() {
+    set_cleanup_trap
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return 0
 
-    stat=$(LC_ALL=C $RUNAS dd if=/dev/zero of=$file1 bs=1024 count=$((LIMIT*2)) 2>&1)
-    RC=$?
-    echo $stat
-    [[ $RC -eq 0 ]] && error "dd did not fail with EDQUOT."
-    echo $stat | grep "Disk quota exceeded"
-    [[ $? -eq 1 ]] && error "dd did not fail with EDQUOT."
-
-    echo "second run"
-    $LFS quotaoff -ug $MOUNT
-    # $LFS setquota -u $TSTUSR -b $LIMIT -B $LIMIT $dir
-    chown $TSTUSR.$TSTUSR $dir
-    i=0
-    RC=0
-    while [ $RC -eq 0 ];
-    do
-      i=$((i+1))
-      stat=$(LOCALE=C $RUNAS2 dd if=/dev/zero of=${file2}$i bs=1024 \
-          count=$((LIMIT*LIMIT)) 2>&1)
-      RC=$?
-      if [ $RC -eq 1 ]; then
-          echo $stat
-          echo $stat | grep "Disk quota exceeded"
-          [[ $? -eq 0 ]] && error "dd failed with EDQUOT"
-
-          echo $stat | grep "No space left on device"
-          [[ $? -ne 0 ]] && error "dd did not fail with ENOSPC; " \
-              "failed with $stat"
-      fi
-    done
+    mkdir -p $POOL_ROOT
+    check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS || {
+        skip_env "User $RUNAS_ID does not exist - skipping"
+        return 0
+    }
 
-    df -h
+    local i=0
+    local TGT
+    local dir=$POOL_ROOT/dir
+    local file="$dir/$tfile-quota"
 
-    rm -rf $POOL_ROOT
-    destroy_pool $POOL
+    create_pool_nofail $POOL
 
-    return 0
+    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
+
+	local maxfree=$((1024 * 1024 * 30)) # 30G
+	local AVAIL=$(lfs_df -p $POOL $dir | awk '/summary/ { print $4 }')
+	[ $AVAIL -gt $maxfree ] &&
+		skip_env "Filesystem space $AVAIL is larger than " \
+			"$maxfree limit" && return 0
+
+	echo "OSTCOUNT=$OSTCOUNT, OSTSIZE=$OSTSIZE, AVAIL=$AVAIL"
+	echo "MAXFREE=$maxfree, SLOW=$SLOW"
+
+	# XXX remove the interoperability code once we drop the old server
+	#     ( < 2.3.50) support.
+	if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ]; then
+		$LFS quotaoff -ug $MOUNT
+	else
+		do_facet mgs $LCTL conf_param $FSNAME.quota.ost=none
+		sleep 5
+	fi
+
+	chown $RUNAS_ID.$RUNAS_ID $dir
+	i=0
+	local RC=0
+	local TOTAL=0 # KB
+	local stime=$(date +%s)
+	local stat
+	local etime
+	local elapsed
+	local maxtime=300 # minimum speed: 5GB / 300sec ~= 17MB/s
+	while [ $RC -eq 0 ]; do
+		i=$((i + 1))
+		stat=$(LOCALE=C $RUNAS2 dd if=/dev/zero of=${file}$i bs=1M \
+			count=$((5 * 1024)) 2>&1)
+		RC=$?
+		TOTAL=$((TOTAL + 1024 * 1024 * 5))
+		echo "[$i iteration] $stat"
+		echo "total written: $TOTAL"
+
+		etime=$(date +%s)
+		elapsed=$((etime - stime))
+		echo "stime=$stime, etime=$etime, elapsed=$elapsed"
+
+		if [ $RC -eq 1 ]; then
+			echo $stat | grep -q "Disk quota exceeded"
+			[[ $? -eq 0 ]] &&
+				error "dd failed with EDQUOT with quota off"
+
+			echo $stat | grep -q "No space left on device"
+			[[ $? -ne 0 ]] &&
+				error "dd did not fail with ENOSPC"
+		elif [ $TOTAL -gt $AVAIL ]; then
+			error "dd didn't fail with ENOSPC ($TOTAL > $AVAIL)"
+		elif [ $i -eq 1 -a $elapsed -gt $maxtime ]; then
+			log "The first 5G write used $elapsed (> $maxtime) " \
+				"seconds, terminated"
+			RC=1
+		fi
+	done
+
+	df -h
+	rm -rf $POOL_ROOT
 }
-run_test 23 "OST pools and quota"
+run_test 23b "OST pools and OOS"
 
 test_24() {
+    set_cleanup_trap
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+    [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
 
     local numfiles=10
     local i=0
@@ -1224,7 +1320,6 @@ test_24() {
     local dir
     local res
 
-
     create_pool_nofail $POOL
 
     add_pool $POOL $TGT_ALL "$TGT_UUID"
@@ -1232,98 +1327,146 @@ test_24() {
     create_dir $POOL_ROOT/dir1 $POOL $OSTCOUNT
 
     mkdir $POOL_ROOT/dir2
-    $SETSTRIPE $POOL_ROOT/dir2 -p $POOL -s 65536 -i 0 -c 1 || \
+    $SETSTRIPE -p $POOL -S 65536 -i 0 -c 1 $POOL_ROOT/dir2 ||
         error "$SETSTRIPE $POOL_ROOT/dir2 failed"
 
     mkdir $POOL_ROOT/dir3
-    $SETSTRIPE $POOL_ROOT/dir3 -s 65536 -i 0 -c 1 || \
+    $SETSTRIPE -S 65536 -i 0 -c 1 $POOL_ROOT/dir3 ||
         error "$SETSTRIPE $POOL_ROOT/dir3 failed"
 
     mkdir $POOL_ROOT/dir4
 
-    for i in $(seq 1 4);
-    do
-      dir=${POOL_ROOT}/dir${i}
-      local pool
-      local pool1
-      local count
-      local count1
-      local index
-      local size
-      local size1
-
-      createmany -o $dir/${tfile} $numfiles || \
-          error "createmany $dir/${tfile} failed!"
-      res=$($GETSTRIPE -v $dir | grep "^stripe_count:")
-      if [ $? -ne 0 ]; then
-          res=$($GETSTRIPE -v $dir | grep "^(Default) ")
-          pool=$(cut -f 9 -d ' ' <<< $res)
-          index=$(cut -f 7 -d ' ' <<< $res)
-          size=$(cut -f 5 -d ' ' <<< $res)
-          count=$(cut -f 3 -d ' ' <<< $res)
-      else
-          pool=$(cut -f 8 -d ' ' <<< $res)
-          index=$(cut -f 6 -d ' ' <<< $res)
-          size=$(cut -f 4 -d ' ' <<< $res)
-          count=$(cut -f 2 -d ' ' <<< $res)
-      fi
-
-      for file in $dir/*; do
-          if [ "$pool" != "" ]; then
-              check_file_in_pool $file $pool
-          fi
-          pool1=$($GETSTRIPE -v $file | grep "^pool:" |\
-              tr -d '[:blank:]' | cut -f 2 -d ':')
-          count1=$($GETSTRIPE -v $file | grep "^lmm_stripe_count:" |\
-              tr -d '[:blank:]' | cut -f 2 -d ':')
-          size1=$($GETSTRIPE -v $file | grep "^lmm_stripe_size:" |\
-              tr -d '[:blank:]' | cut -f 2 -d ':')
-          [[ "$pool" != "$pool1" ]] && \
-              error "Pool name ($pool) not inherited in $file($pool1)"
-          [[ "$count" != "$count1" ]] && \
-              error "Stripe count ($count) not inherited in $file ($count1)"
-          [[ "$size" != "$size1" ]] && [[ "$size" != "0" ]] && \
-              error "Stripe size ($size) not inherited in $file ($size1)"
-      done 
+    for i in 1 2 3 4; do
+        dir=${POOL_ROOT}/dir${i}
+        local pool
+        local pool1
+        local count
+        local count1
+        local index
+        local size
+        local size1
+
+        createmany -o $dir/${tfile} $numfiles ||
+            error "createmany $dir/${tfile} failed!"
+        res=$($GETSTRIPE -v $dir | grep "^stripe_count:")
+        if [ $? -ne 0 ]; then
+            res=$($GETSTRIPE -v $dir | grep "^(Default) ")
+            pool=$(cut -f 9 -d ' ' <<< $res)
+            index=$(cut -f 7 -d ' ' <<< $res)
+            size=$(cut -f 5 -d ' ' <<< $res)
+            count=$(cut -f 3 -d ' ' <<< $res)
+        else
+            pool=$(cut -f 8 -d ' ' <<< $res)
+            index=$(cut -f 6 -d ' ' <<< $res)
+            size=$(cut -f 4 -d ' ' <<< $res)
+            count=$(cut -f 2 -d ' ' <<< $res)
+        fi
+
+        for file in $dir/*; do
+            if [ "$pool" != "" ]; then
+                check_file_in_pool $file $pool
+            fi
+            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:" |
+                    tr -d '[:blank:]' | cut -f 2 -d ':')
+            [[ "$pool" != "$pool1" ]] &&
+                error "Pool name ($pool) not inherited in $file($pool1)"
+            [[ "$count" != "$count1" ]] &&
+                error "Stripe count ($count) not inherited in $file ($count1)"
+            [[ "$size" != "$size1" ]] && [[ "$size" != "0" ]] &&
+                error "Stripe size ($size) not inherited in $file ($size1)"
+        done
     done
 
     rm -rf $POOL_ROOT
-    destroy_pool $POOL
 
     return 0
 }
 run_test 24 "Independence of pool from other setstripe parameters"
 
 test_25() {
+    set_cleanup_trap
     local dev=$(mdsdevname ${SINGLEMDS//mds/})
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
     mkdir -p $POOL_ROOT
 
     for i in $(seq 10); do
-        create_pool_nofail pool$i
-        stop $SINGLEMDS -f  || return 1
-        sleep 10
-        start $SINGLEMDS ${dev} $MDS_MOUNT_OPTS  || \
-            error "Failed to start $SINGLEMDS after stopping" 
-
+        create_pool_nofail $POOL$i
+        do_facet $SINGLEMDS "lctl pool_add $FSNAME.$POOL$i OST0000; sync"
+        wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL$i |
+            sort -u | tr '\n' ' ' " "$FSNAME-OST0000_UUID " >/dev/null ||
+                error "pool_add failed: $1; $2"
+
+        stop $SINGLEMDS || return 1
+        start $SINGLEMDS ${dev} $MDS_MOUNT_OPTS ||
+            { error "Failed to start $SINGLEMDS after stopping" && break; }
+        wait_osc_import_state mds ost FULL
+        clients_up
+
+        wait_mds_ost_sync
         # Veriy that the pool got created and is usable
-        echo "Creating a file in pool$i"
-        create_file $POOL_ROOT/file$i pool$i
-        check_file_in_pool $POOL_ROOT/file$i pool$i
+        df $POOL_ROOT > /dev/null
+        sleep 5
+        # Make sure OST0 can be striped on
+        $SETSTRIPE -i 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
-    for i in $(seq 10); do
-        destroy_pool pool$i
+}
+run_test 25 "Create new pool and restart MDS"
+
+test_26() {
+    [[ $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 $POOL2
+
+    do_facet $SINGLEMDS "lctl pool_add $FSNAME.$POOL2 OST0000; sync"
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL2 |
+        sort -u | grep $FSNAME-OST0000_UUID " "$FSNAME-OST0000_UUID" ||
+            error "pool_add failed: $1; $2"
+
+    do_facet $SINGLEMDS "lctl pool_add $FSNAME.$POOL2 OST0002; sync"
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL2 |
+        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 $POOL2"
+
+    for ((i = 0; i < 10; i++)); do
+        #OBD_FAIL_MDS_OSC_CREATE_FAIL     0x147
+        #Fail OST0000 to ensure 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 $POOL2 1 -1 || break
+        do_facet $SINGLEMDS lctl set_param fail_loc=0
+        check_file_in_pool $POOL_ROOT/file$i $POOL2 || break
     done
+    rm -rf $POOL_ROOT
 }
-run_test 25 "Create new pool and restart MDS ======================="
+run_test 26 "Choose other OSTs in the pool first in the creation remedy"
 
-log "cleanup: ======================================================"
 cd $ORIG_PWD
-cleanup_tests
+
+complete $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