From 73a02a600934788126b09594b1ca6bbc40f9910b Mon Sep 17 00:00:00 2001
From: manoj <manoj>
Date: Thu, 13 Aug 2009 17:15:17 +0000
Subject: [PATCH] b=19780 r=nathan.rutman r=grev r=edg

Tests for the OST Pools feature
---
 lustre/tests/Makefile.am         |    2 +-
 lustre/tests/acceptance-small.sh |   10 +-
 lustre/tests/ost-pools.sh        | 1311 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 1321 insertions(+), 2 deletions(-)
 create mode 100644 lustre/tests/ost-pools.sh

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 321c638..31175ad 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -23,7 +23,7 @@ noinst_SCRIPTS += sanity-sec.sh sanity-gss.sh krb5_login.sh setup_kerberos.sh
 noinst_SCRIPTS += recovery-mds-scale.sh run_dd.sh run_tar.sh run_iozone.sh
 noinst_SCRIPTS += run_dbench.sh run_IOR.sh recovery-double-scale.sh
 noinst_SCRIPTS += recovery-random-scale.sh parallel-scale.sh metadata-updates.sh
-noinst_SCRIPTS += lreplicate-test.sh
+noinst_SCRIPTS += lreplicate-test.sh ost-pools.sh
 nobase_noinst_SCRIPTS = cfg/local.sh
 nobase_noinst_SCRIPTS += acl/make-tree acl/run cfg/ncli.sh
 nobase_noinst_SCRIPTS += racer/dir_create.sh racer/file_create.sh racer/file_list.sh
diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 6401abc..4e38b39 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -23,7 +23,7 @@ fi
 [ "$DEBUG_OFF" ] || DEBUG_OFF="eval lctl set_param debug=\"$DEBUG_LVL\""
 [ "$DEBUG_ON" ] || DEBUG_ON="eval lctl set_param debug=0x33f0484"
 
-export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA SANITY_SEC SANITY_GSS PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE PARALLEL_SCALE LREPLICATE_TEST METADATA_UPDATES"
+export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA SANITY_SEC SANITY_GSS PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE PARALLEL_SCALE LREPLICATE_TEST METADATA_UPDATES OST_POOLS"
 
 if [ "$ACC_SM_ONLY" ]; then
     for O in $TESTSUITE_LIST; do
@@ -446,6 +446,14 @@ if [ "$LREPLICATE_TEST" != "no" ]; then
         LREPLICATE_TEST="done"
 fi
 
+[ "$OST_POOLS" != "no" ] && skip_remmds ost-pools && OST_POOLS=no && MSKIPPED=1
+[ "$OST_POOLS" != "no" ] && skip_remost ost-pools && OST_POOLS=no && OSKIPPED=1
+if [ "$OST_POOLS" != "no" ]; then
+        title ost-pools
+        bash ost-pools.sh
+        OST_POOLS="done"
+fi
+
 
 [ "$SLOW" = no ] && PERFORMANCE_SANITY="no"
 [ -x "$MDSRATE" ] || PERFORMANCE_SANITY="no"
diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
new file mode 100644
index 0000000..ec083ab
--- /dev/null
+++ b/lustre/tests/ost-pools.sh
@@ -0,0 +1,1311 @@
+#!/bin/bash
+#
+# 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`
+export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
+
+ONLY=${ONLY:-"$*"}
+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`"
+
+TMP=${TMP:-/tmp}
+ORIG_PWD=${PWD}
+
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
+check_and_setup_lustre
+
+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"
+
+# OST pools tests
+POOL=${POOL:-pool1}
+POOL2=${POOL2:-pool2}
+POOL3=${POOL3:-pool3}
+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_STEP=1
+TGT_LIST=$(seq $TGT_FIRST $TGT_STEP $TGT_MAX)
+TGT_LIST2=$(seq $TGT_FIRST 2 $TGT_MAX)
+
+TGT_ALL="$FSNAME-OST[$TGT_FIRST-$TGT_MAX/1]"
+TGT_HALF="$FSNAME-OST[$TGT_FIRST-$TGT_MAX/2]"
+
+TGT_UUID=$(for i in $TGT_LIST; do printf "$FSNAME-OST%04x_UUID " $i; done)
+TGT_UUID2=$(for i in $TGT_LIST2; do printf "$FSNAME-OST%04x_UUID " $i; done)
+
+create_dir() {
+    local dir=$1
+    local pool=$2
+    local count=${3:-"-1"}
+    local idx=$4
+
+    mkdir -p $dir
+    if [[ -n $4 ]]; then
+	$SETSTRIPE -c $count -p $pool $dir -o $idx
+    else
+	$SETSTRIPE -c $count -p $pool $dir
+    fi
+    [[ $? -eq 0 ]] || \
+	error "$SETSTRIPE -p $pool $dir failed."
+}
+
+create_file() {
+    local file=$1
+    local pool=$2
+    local count=${3:-"-1"}
+    local index=${4:-"-1"}
+    rm -f $file
+    $SETSTRIPE -o $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 mds lctl pool_list $FSNAME.$pool | grep -v "^Pool:" \
+	| sed -e 's/_UUID$//;s/^.*-OST//'); do
+      res="$res $(printf "%d" 0x$i)"
+    done
+    echo $res
+}
+
+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
+	error found $res instead of $pool
+	return 1
+    fi
+}
+
+check_file_in_pool() {
+    local osts=$(osts_in_pool $2)
+    check_file_in_osts $1 "$osts" $3
+}
+
+check_file_in_osts() {
+	local file=$1
+	local pool_list=${2:-$TGT_LIST}
+	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:)
+		if [[ "$found" == "" ]]; then
+			echo "pool list: $pool_list"
+			echo "striping: $res"
+			$GETSTRIPE $file
+			error "$file not allocated from OSTs $pool_list."
+			return 1
+		fi
+	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
+}
+
+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 ':')
+    if [[ "$res" == "$pool" ]]; then
+	error "File $file is in pool: $res"
+	return 1
+    else
+	return 0
+    fi
+}
+
+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 ' ')
+    if [[ "$res" == "$pool" ]]; then
+	error "File $dir is in pool: $res"
+	return 1
+    else
+	return 0
+    fi
+}
+
+create_pool() {
+    do_facet mds 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
+}
+
+destroy_pool_int() {
+      OSTS=$(do_facet mds lctl pool_list $1 | awk '$1 !~ /^Pool:/ {print $1}')
+      for ost in $OSTS
+      do
+	do_facet mds lctl pool_remove $1 $ost
+      done
+      do_facet mds lctl pool_destroy $1
+}
+
+destroy_pool() {
+    local RC
+
+    do_facet mds lctl pool_list $FSNAME.$1
+    RC=$?
+    [[ $RC -ne 0 ]] && return $RC
+
+    destroy_pool_int $FSNAME.$1
+    RC=$?
+    [[ $RC -ne 0 ]] && return $RC
+
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$1 \
+      2>/dev/null || echo foo" "foo" && return 0
+}
+
+add_pool() {
+    local pool=$1
+    local osts=$2
+    local tgt="${3}$(lctl get_param -n lov.$FSNAME-*.pools.$pool | sort -u | tr '\n' ' ')"
+
+    do_facet mds 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
+    [[ $RC -ne 0 ]] && error "pool_add failed: $1; $2"
+    return $RC
+}
+
+create_pool_nofail() {
+    create_pool $1
+    if [[ $? != 0 ]]
+    then
+	error "Pool creation of $1 failed"
+    fi
+}
+
+create_pool_fail() {
+    create_pool $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 mds lctl pool_list $FSNAME | grep $FSNAME.pool[0-$OSTCOUNT]); do
+	destroy_pool_int $p;
+    done
+    rm -rf $DIR/d0.${TESTSUITE}
+}
+
+ost_pools_init() {
+    cleanup_tests
+}
+
+
+# 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"
+    create_pool_nofail p
+
+    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 mds lctl pool_new .pool1
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though fs-name was missing."
+    do_facet mds lctl pool_new pool1
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though fs-name was missing."
+    do_facet mds lctl pool_new ${FSNAME}.
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though pool name was missing."
+    do_facet mds lctl pool_new .
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though pool name and fs-name " \
+	    "were missing."
+    do_facet mds lctl pool_new ${FSNAME},pool1
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though pool name format was wrong"
+    do_facet mds lctl pool_new ${FSNAME}/pool1
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though pool name format was wrong"
+
+    do_facet mds lctl pool_new ${FSNAME}.p
+    [[ $? -ne 0 ]] || \
+	error "pool_new did not fail even though pool1 existed"
+    destroy_pool p
+
+}
+run_test 1 "Test lctl pool_new  ========================================="
+
+test_2a() {
+    destroy_pool $POOL
+
+    do_facet mds lctl pool_add $FSNAME.$POOL $FSNAME-OST0000
+    [[ $? -ne 0 ]] || \
+	error " pool_add did not fail even though pool did " \
+	" not exist."
+}
+run_test 2a "pool_add: non-existant pool"
+
+test_2b() {
+    do_facet mds lctl pool_add $FSNAME.p1234567891234567890 $FSNAME-OST0000
+    [[ $? -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() {
+    local TGT
+    local RC
+
+    lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] || \
+	destroy_pool $POOL
+
+    create_pool_nofail $POOL
+
+    # 1. OST0000
+    do_facet mds lctl pool_add $FSNAME.$POOL OST0000
+    RC=$?; [[ $RC -eq 0 ]] || \
+	error "pool_add failed. $FSNAME $POOL OST0000: $RC"
+    do_facet mds lctl pool_remove $FSNAME.$POOL OST0000
+
+    # 2. lustre­OST0000
+    do_facet mds lctl pool_add $FSNAME.$POOL $FSNAME-OST0000
+    RC=$?; [[ $RC -eq 0 ]] || \
+	error "pool_add failed. $FSNAME $POOL $FSNAME-OST0000: $RC"
+    do_facet mds lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000
+
+    # 3. lustre­OST0000_UUID
+    do_facet mds lctl pool_add $FSNAME.$POOL $FSNAME-OST0000_UUID
+    RC=$?; [[ $RC -eq 0 ]] || \
+	error "pool_add failed. $FSNAME $POOL $FSNAME-OST0000_UUID: $RC"
+    do_facet mds lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000_UUID
+
+    # 4. lustre­OST[0,1,2,3,]
+    TGT="$FSNAME-OST["
+    for i in $TGT_LIST; do TGT=${TGT}$(printf "$i," $i); done
+    TGT="${TGT}]"
+    do_facet mds lctl pool_add $FSNAME.$POOL $TGT
+    [[ $? -eq 0 ]] || \
+	error "pool_add failed. $FSNAME.$POOL $TGT. $RC"
+    do_facet mds lctl pool_remove $FSNAME.$POOL $TGT
+
+    # 5. lustre­OST[0-5/1]
+    do_facet mds lctl pool_add $FSNAME.$POOL $TGT_ALL
+    RC=$?; [[ $RC -eq 0 ]] || \
+	error "pool_add failed. $FSNAME $POOL" "$TGT_ALL $RC"
+    wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.$POOL | \
+      sort -u | tr '\n' ' ' " "$TGT_UUID" || error "Add to pool failed"
+    do_facet mds lctl pool_remove $FSNAME.$POOL $TGT_ALL
+
+    destroy_pool $POOL
+}
+run_test 2c "pool_add: OST index combinations ==========================="
+
+test_2d() {
+    local TGT
+    local RC
+
+    lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] || \
+	destroy_pool $POOL
+
+    create_pool_nofail $POOL
+
+    TGT=$(printf "$FSNAME-OST%04x_UUID " $OSTCOUNT)
+    do_facet mds lctl pool_add $FSNAME.$POOL $TGT
+    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 ========"
+
+test_2e() {
+    local TGT
+    local RC
+    local RESULT
+
+    $LCTL get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] || \
+	destroy_pool $POOL
+
+    create_pool_nofail $POOL
+
+    TGT="$FSNAME-OST0000_UUID "
+    do_facet mds 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"
+    RESULT=$(do_facet mds "LOCALE=C $LCTL pool_add $FSNAME.$POOL $TGT 2>&1")
+    RC=$?
+    echo $RESULT
+
+    [[ $RC -ne 0 ]] || \
+	error "pool_add succeeded for an OST that was already in the pool."
+
+    [[ $(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 ========"
+
+test_3a() {
+    lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] || \
+	destroy_pool $POOL
+
+    do_facet mds lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000
+    [[ $? -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 mds lctl pool_remove ${NON_EXISTANT_FS}.$POOL OST0000
+    [[ $? -ne 0 ]] || \
+	error "pool_remove did not fail even though fsname did not exist."
+}
+run_test 3b "pool_remove: non-existant fsname"
+
+test_3c() {
+    do_facet mds lctl pool_remove $FSNAME.p1234567891234567890 $FSNAME-OST0000
+    [[ $? -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() {
+    lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] || \
+	destroy_pool $POOL
+
+    create_pool_nofail $POOL
+    do_facet mds lctl pool_add $FSNAME.$POOL OST0000
+    do_facet mds lctl pool_remove $FSNAME.$POOL OST0000
+    [[ $? -eq 0 ]] || \
+	error "pool_remove failed. $FSNAME $POOL OST0000"
+
+    do_facet mds lctl pool_add $FSNAME.$POOL $FSNAME-OST0000
+    do_facet mds lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000
+    [[ $? -eq 0 ]] || \
+	error "pool_remove failed. $FSNAME $POOL $FSNAME-OST0000"
+
+    do_facet mds lctl pool_add $FSNAME.$POOL $FSNAME-OST0000_UUID
+    do_facet mds lctl pool_remove $FSNAME.$POOL $FSNAME-OST0000_UUID
+    [[ $? -eq 0 ]] || \
+	error "pool_remove failed. $FSNAME $POOL $FSNAME-OST0000_UUID"
+
+    add_pool $POOL $TGT_ALL "$TGT_UUID"
+
+    do_facet mds lctl pool_remove $FSNAME.$POOL $TGT_ALL
+    [[ $? -eq 0 ]] || \
+	error "pool_remove failed. $FSNAME $POOL" $TGT_ALL
+
+    destroy_pool $POOL
+}
+run_test 3d "pool_remove: OST index combinations ==========================="
+
+test_4a() {
+    lctl get_param -n lov.$FSNAME-*.pools.$POOL 2>/dev/null
+    [[ $? -ne 0 ]] || \
+	destroy_pool $POOL
+
+    do_facet mds lctl pool_destroy $FSNAME.$POOL
+    [[ $? -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 mds lctl pool_destroy ${NON_EXISTANT_FS}.$POOL
+    [[ $? -ne 0 ]] || \
+	error "pool_destroy did not fail even though the filesystem did not exist."
+}
+run_test 4b "pool_destroy: non-existant fs-name"
+
+test_4c() {
+    create_pool_nofail $POOL
+    add_pool $POOL "OST0000" "$FSNAME-OST0000_UUID "
+
+    do_facet mds lctl pool_destroy ${FSNAME}.$POOL
+    [[ $? -ne 0 ]] || \
+	error "pool_destroy succeeded with a non-empty pool name."
+    destroy_pool $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."
+
+    destroy_pool $POOL
+    destroy_pool $POOL2
+
+    create_pool_nofail $POOL
+    create_pool_nofail $POOL2
+    $LCMD pool_list $FSNAME
+    [[ $? -eq 0 ]] || \
+	error "pool_list $FSNAME failed."
+
+    do_facet mds lctl pool_add $FSNAME.$POOL $TGT_ALL
+
+    $LCMD pool_list $FSNAME.$POOL
+    [[ $? -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 ${FSNAME}.$NON_EXISTANT_POOL
+    [[ $? -ne 0 ]] || \
+	error "pool_list did not fail for a non-existant pool $NON_EXISTANT_POOL"
+
+    if [[ ! $(grep mds <<< $LCMD) ]]; then
+	echo $LCMD pool_list $DIR
+	$LCMD pool_list $DIR
+	[[ $? -eq 0 ]] || \
+	    error "pool_list failed for $DIR"
+    fi
+
+    rm -rf ${DIR}nonexistant
+    $LCMD pool_list ${DIR}nonexistant
+    [[ $? -ne 0 ]] || \
+	error "pool_list did not fail for invalid mountpoint ${DIR}nonexistant"
+
+    mkdir -p ${DIR}/d1
+    $LCMD pool_list ${DIR}/d1
+    [[ $? -ne 0 ]] || \
+	error "pool_list did not fail for invalid mountpoint ${DIR}/d1"
+
+    destroy_pool $POOL
+    destroy_pool $POOL2
+}
+
+test_5() {
+    # Issue commands from client
+    sub_test_5 $LCTL
+    sub_test_5 $LFS
+
+    # Issue commands from MDS
+    sub_test_5 "do_facet mds lctl"
+    sub_test_5 "do_facet mds lfs"
+
+}
+run_test 5 "lfs/lctl pool_list"
+
+test_6() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    local POOL_DIR=$POOL_ROOT/dir_tst
+    local POOL_FILE=$POOL_ROOT/file_tst
+
+    create_pool_nofail $POOL
+
+    do_facet mds lctl pool_list $FSNAME
+    [[ $? -eq 0 ]] || \
+	error "pool_list $FSNAME failed."
+
+    do_facet mds lctl pool_add $FSNAME.$POOL $TGT_ALL
+
+    mkdir -p $POOL_DIR
+    $SETSTRIPE -c -1 -p $POOL $POOL_DIR
+    [[ $? -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."
+
+    # 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."
+
+    # 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."
+    $SETSTRIPE -c -1 $POOL_FILE
+    [[ $? -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 ]] || \
+	error "$SETSTRIPE with start index outside the pool did not fail."
+
+    destroy_pool $POOL
+    destroy_pool $POOL2
+}
+run_test 6 "getstripe/setstripe"
+
+test_11() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+
+    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+
+    create_pool_nofail $POOL
+    create_pool_nofail $POOL2
+
+    do_facet mds lctl pool_add $FSNAME.$POOL \
+	$FSNAME-OST[$TGT_FIRST-$TGT_MAX/2]
+    local start=$((TGT_FIRST+1))
+    do_facet mds lctl pool_add $FSNAME.$POOL2 \
+	$FSNAME-OST[$start-$TGT_MAX/2]
+
+    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 || \
+	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 || \
+	error "createmany $POOL_ROOT/dir2/$tfile failed!"
+    for file in $POOL_ROOT/dir2/*; do
+	check_file_in_pool $file $POOL2
+    done
+
+    rm -rf $POOL_ROOT/dir?
+
+    destroy_pool $POOL
+    destroy_pool $POOL2
+
+    return 0
+}
+run_test 11 "OSTs in overlapping/multiple pools"
+
+test_12() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+
+    [[ $OSTCOUNT -le 2 ]] && skip "Need atleast 3 OSTs" && return
+
+    create_pool_nofail $POOL
+    create_pool_nofail $POOL2
+
+    do_facet mds lctl pool_add $FSNAME.$POOL \
+	$FSNAME-OST[$TGT_FIRST-$TGT_MAX/2]
+    local start=$((TGT_FIRST+1))
+    do_facet mds lctl pool_add $FSNAME.$POOL2 \
+	$FSNAME-OST[$start-$TGT_MAX/2]
+
+    echo creating some files in $POOL and $POOL2
+
+    create_dir $POOL_ROOT/dir1  $POOL
+    create_dir $POOL_ROOT/dir2  $POOL2
+    create_file $POOL_ROOT/file1 $POOL
+    create_file $POOL_ROOT/file2 $POOL2
+
+    echo Checking the files created
+    check_dir_in_pool $POOL_ROOT/dir1 $POOL
+    check_dir_in_pool $POOL_ROOT/dir2 $POOL2
+    check_file_in_pool $POOL_ROOT/file1 $POOL
+    check_file_in_pool $POOL_ROOT/file2 $POOL2
+
+    echo Changing the pool membership
+    do_facet mds lctl pool_remove $FSNAME.$POOL $FSNAME-OST[$TGT_FIRST]
+    do_facet mds lctl pool_list $FSNAME.$POOL
+    do_facet mds lctl pool_add $FSNAME.$POOL2 $FSNAME-OST[$TGT_FIRST]
+    do_facet mds lctl pool_list $FSNAME.$POOL2
+
+    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)"
+
+    echo Creating some more files
+    create_dir $POOL_ROOT/dir3 $POOL
+    create_dir $POOL_ROOT/dir4 POOL2
+    create_file $POOL_ROOT/file3 $POOL
+    create_file $POOL_ROOT/file4 $POOL2
+
+    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    
+}
+run_test 12 "OST Pool Membership"
+
+test_13() {
+    [[ $OSTCOUNT -le 2 ]] && skip "Need atleast 3 OSTs" && return
+
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    local numfiles=10
+    local count=3
+
+    create_pool_nofail $POOL
+    do_facet mds lctl pool_add $FSNAME.$POOL $TGT_ALL
+
+    create_dir $POOL_ROOT/dir1 $POOL -1
+    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))
+    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_dir $POOL_ROOT/dir2 $POOL $count
+    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!"
+    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!"
+    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!"
+    for file in $POOL_ROOT/dir5/*; do
+	check_file_in_pool $file $POOL 1
+	check_file_in_osts  $file "$((TGT_FIRST+2))"
+    done
+
+    rm -rf create_dir $POOL_ROOT/dir?
+    destroy_pool $POOL
+
+    return 0
+}
+run_test 13 "Striping characteristics in a pool"
+
+test_14() {
+    [[ $OSTCOUNT -le 2 ]] && skip "Need atleast 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
+
+    create_pool_nofail $POOL
+    create_pool_nofail $POOL2
+
+    add_pool $POOL $TGT_HALF "$TGT_UUID2"
+    add_pool $POOL2 "OST0000" "$FSNAME-OST0000_UUID "
+
+    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)    
+    i=0
+    while [[ $i -lt $numfiles ]];
+    do
+	OST=$((OST+2))
+	[[ $OST -gt $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))
+    done
+
+    # Fill OST $TGT_FIRST with 10M files
+    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))
+    done
+
+    # Leave some space on the OST
+    rm -f $POOL_ROOT/dir2/f0
+    df -h /mnt/ost?
+
+    # 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!"
+    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() {
+    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!"
+
+      for file in $POOL_ROOT/dir$i/*; do
+	  check_file_in_osts $file $i
+      done
+
+      i=$((i+1))
+    done
+
+    i=0
+    while [[ $i -lt $OSTCOUNT ]]
+    do
+      destroy_pool pool${i}
+      i=$((i+1))
+    done
+
+    return 0
+}
+run_test 15 "One directory per OST/pool"
+
+test_16() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    local numfiles=10
+    local i=0
+
+    create_pool_nofail $POOL
+
+    add_pool $POOL $TGT_HALF "$TGT_UUID2"
+
+    local dir=$POOL_ROOT/$tdir
+    create_dir $dir $POOL
+
+    for i in $(seq 1 10); do
+	dir=${dir}/dir${i}
+    done
+    mkdir -p $dir
+
+    createmany -o $dir/$tfile $numfiles || \
+	  error "createmany $dir/$tfile failed!"
+
+    for file in $dir/*; do
+	check_file_in_pool $file $POOL
+    done
+
+    rm -rf $POOL_ROOT/$tdir
+
+    destroy_pool $POOL
+
+    return 0
+}
+run_test 16 "Inheritance of pool properties"
+
+test_17() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    local numfiles=10
+    local i=0
+
+    create_pool_nofail $POOL
+
+    add_pool $POOL $TGT_ALL "$TGT_UUID"
+
+    local dir=$POOL_ROOT/dir
+    create_dir $dir $POOL
+
+    createmany -o $dir/${tfile}1_ $numfiles || \
+	  error "createmany $dir/${tfile}1_ failed!"
+
+    for file in $dir/*; do
+	check_file_in_pool $file $POOL
+    done
+
+    destroy_pool $POOL
+
+    createmany -o $dir/${tfile}2_ $numfiles || \
+	  error "createmany $dir/${tfile}2_ failed!"
+
+    rm -rf $dir
+    return 0
+}
+run_test 17 "Referencing an empty pool"
+
+create_perf_one() {
+    local dir=$1/d
+    local numfiles=$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
+    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"
+}
+
+test_18() {
+    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)
+
+    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() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    local numfiles=12
+    local dir1=$POOL_ROOT/dir1
+    local dir2=$POOL_ROOT/dir2
+    local i=0
+
+    create_pool_nofail $POOL
+
+    add_pool $POOL $TGT_HALF "$TGT_UUID2"
+
+    create_dir $dir1 $POOL
+    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 || \
+	  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() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    local numfiles=12
+    local dir1=$POOL_ROOT/dir1
+    local dir2=$dir1/dir2
+    local dir3=$dir1/dir3
+    local i=0
+    local TGT
+
+    create_pool_nofail $POOL
+    create_pool_nofail $POOL2
+
+    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)
+    add_pool $POOL2 "$FSNAME-OST[$start-$TGT_MAX/2]" "$TGT"
+
+    create_dir $dir1 $POOL
+    create_file $dir1/file1 $POOL2
+    create_dir $dir2 $POOL2
+    touch $dir2/file2
+    mkdir $dir3
+    $SETSTRIPE -c 1 $dir3 # No pool assignment
+    touch $dir3/file3
+    $SETSTRIPE -c 1 $dir2/file4 # No pool assignment
+
+    echo start checks
+    check_file_in_pool $dir1/file1 $POOL2
+    check_file_in_pool $dir2/file2 $POOL2
+
+    echo check \#2
+    check_dir_not_in_pool $dir3 $POOL
+    check_dir_not_in_pool $dir3 $POOL2
+
+    echo check \#3
+    check_file_not_in_pool $dir3/file3 $POOL
+    check_file_not_in_pool $dir3/file3 $POOL2
+
+    echo check \#4
+    check_file_not_in_pool $dir2/file4 $POOL
+    check_file_not_in_pool $dir2/file4 $POOL2
+
+    echo check \#5
+    rm -rf $dir1
+    destroy_pool $POOL
+    destroy_pool $POOL2
+
+    return 0
+}
+run_test 20 "Different pools in a directory hierarchy."
+
+test_21() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+
+    local numfiles=12
+    local i=0
+    local dir=$POOL_ROOT/dir
+
+    create_pool_nofail $POOL
+
+    add_pool $POOL $TGT_HALF "$TGT_UUID2"
+
+    create_dir $dir $POOL $OSTCOUNT
+    create_file $dir/file1 $POOL $OSTCOUNT
+    $GETSTRIPE -v $dir/file1
+    check_file_in_pool $dir/file1 $POOL
+
+    rm -rf $dir
+    destroy_pool $POOL
+
+    return 0
+}
+run_test 21 "OST pool with fewer OSTs than stripe count"
+
+add_loop() {
+    local pool=$1
+    local step=$2
+
+    echo loop for $pool
+
+    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 mds lctl pool_list $FSNAME
+    done
+    echo loop for $pool complete
+}
+
+test_22() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+
+    local numfiles=100
+
+    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!"
+    wait
+
+    return 0
+}
+run_test 22 "Simultaneous manipulation of a pool"
+
+test_23() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+
+    mkdir -p $POOL_ROOT
+    check_runas_id $TSTID $TSTID $RUNAS  || {
+	skip "User $RUNAS_ID does not exist - skipping"
+	return 0
+    }
+
+    local numfiles=12
+    local i=0
+    local TGT
+    local LIMIT=1024
+    local dir=$POOL_ROOT/dir
+    local file1="$dir/$tfile-quota1"
+    local file2="$dir/$tfile-quota2"
+
+    create_pool_nofail $POOL
+
+    local TGT=$(for i in `seq $TGT_FIRST 3 $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
+
+    $LFS setstripe $file1 -c 1 -p $POOL
+    chown $TSTUSR.$TSTUSR $file1
+    ls -l $file1
+    type runas
+
+    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
+
+    df -h
+
+    rm -rf $POOL_ROOT
+    destroy_pool $POOL
+
+    return 0
+}
+run_test 23 "OST pools and quota"
+
+test_24() {
+    local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+    [[ $OSTCOUNT -le 1 ]] && skip "Need atleast 2 OSTs" && return
+
+    local numfiles=10
+    local i=0
+    local TGT
+    local dir
+    local res
+
+
+    create_pool_nofail $POOL
+
+    add_pool $POOL $TGT_ALL "$TGT_UUID"
+
+    create_dir $POOL_ROOT/dir1 $POOL $OSTCOUNT
+
+    mkdir $POOL_ROOT/dir2
+    $SETSTRIPE $POOL_ROOT/dir2 -p $POOL -s 65536 -i 0 -c 1 || \
+	error "$SETSTRIPE $POOL_ROOT/dir2 failed"
+
+    mkdir $POOL_ROOT/dir3
+    $SETSTRIPE $POOL_ROOT/dir3 -s 65536 -i 0 -c 1 || \
+	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 
+    done
+
+    rm -rf $POOL_ROOT
+    destroy_pool $POOL
+
+    return 0
+}
+run_test 24 "Independence of pool from other setstripe parameters"
+
+log "cleanup: ======================================================"
+cd $ORIG_PWD
+cleanup_tests
+check_and_cleanup_lustre
+echo '=========================== finished ==============================='
+[ -f "$POOLSLOG" ] && cat $POOLSLOG && grep -q FAIL $POOLSLOG && exit 1 || true
+echo "$0: completed"
-- 
1.8.3.1