#
# 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:-"$*"}
# 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}
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
else
$SETSTRIPE -c $count -p $pool $dir
fi
- [[ $? -eq 0 ]] || \
+ [[ $? -eq 0 ]] ||
error "$SETSTRIPE -p $pool $dir failed."
}
local index=${4:-"-1"}
rm -f $file
$SETSTRIPE -o $index -c $count -p $pool $file
- [[ $? -eq 0 ]] || \
+ [[ $? -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
}
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() {
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"
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 1; }
-
- return 0
+ [[ -n "$count" ]] && [[ $ost_count -ne $count ]] &&
+ { error "Stripe count $count expected; got $ost_count" && return 1;}
+
+
}
file_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
+ 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 $FSNAME.$1
- if [[ $? != 0 ]]
- then
+ if [[ $? != 0 ]]; then
error "Pool creation of $1 failed"
fi
}
create_pool_fail() {
create_pool $FSNAME.$1
- if [[ $? == 0 ]]
- then
+ 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}
}
set_cleanup_trap() {
- trap "cleanup_pools $FSNAME" EXIT
+ trap "cleanup_tests $FSNAME" EXIT
}
# Initialization
# Tests for new commands added
-test_1() {
+test_1a() {
set_cleanup_trap
- echo "Creating a pool with a 1 character pool name"
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
+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"
- echo "Creating a pool with a 16 character pool name"
- create_pool_nofail p123456789123456
- destroy_pool p123456789123456
+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"
- echo "Creating a pool with a 17 character pool name; should fail"
- create_pool_fail p1234567891234567
+test_1d() {
+ set_cleanup_trap
+ create_pool_fail ${POOL}123456789
+}
+run_test 1d "Create a pool with a 17 char pool name; should fail"
- echo "Creating a pool with a 1000 character pool name; should fail"
- local pool_name="p"
- for ((i=1;i<=999;i++)); do pool_name=${pool_name}"o"; done
+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"
- echo "pool_new should fail if fs-name or poolname are missing."
- do_facet $SINGLEMDS lctl pool_new .pool1 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "pool_new did not fail even though fs-name was missing."
- do_facet $SINGLEMDS lctl pool_new pool1 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "pool_new did not fail even though fs-name was 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."
+ [[ $? -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 though pool name and fs-name " \
- "were missing."
- do_facet $SINGLEMDS lctl pool_new ${FSNAME},pool1 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "pool_new did not fail even though pool name format was wrong"
- do_facet $SINGLEMDS lctl pool_new ${FSNAME}/pool1 2>/dev/null
- [[ $? -ne 0 ]] || \
+ [[ $? -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 2>/dev/null
- [[ $? -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 2>/dev/null
- [[ $? -ne 0 ]] || \
- error " pool_add did not fail even though pool did " \
- " not exist."
+ [[ $? -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() {
set_cleanup_trap
- do_facet $SINGLEMDS lctl pool_add $FSNAME.p1234567891234567890 \
+ do_facet $SINGLEMDS lctl pool_add $FSNAME.${POOL}1234567890 \
$FSNAME-OST0000 2>/dev/null
- [[ $? -ne 0 ]] || \
+ [[ $? -ne 0 ]] ||
error "pool_add did not fail even though pool name was invalid."
}
run_test 2b "pool_add: Invalid pool name"
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. $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. $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
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. $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 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 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 2>/dev/null
- [[ $? -ne 0 ]] || \
+ 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() {
set_cleanup_trap
- do_facet $SINGLEMDS lctl pool_remove ${NON_EXISTANT_FS}.$POOL OST0000 2>/dev/null
- [[ $? -ne 0 ]] || \
+ 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"
set_cleanup_trap
do_facet $SINGLEMDS lctl pool_remove $FSNAME.p1234567891234567890 \
$FSNAME-OST0000 2>/dev/null
- [[ $? -ne 0 ]] || \
+ [[ $? -ne 0 ]] ||
error "pool_remove did not fail even though pool name was invalid."
}
run_test 3c "pool_remove: Invalid pool name"
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 2>/dev/null
- [[ $? -ne 0 ]] || \
+ [[ $? -ne 0 ]] ||
error "pool_destroy did not fail even though pool did not exist."
}
run_test 4a "pool_destroy: non-existant pool"
test_4b() {
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 the filesystem did not exist."
+ [[ $? -ne 0 ]] ||
+ error "pool_destroy did not fail even though filesystem did not exist."
}
run_test 4b "pool_destroy: non-existant fs-name"
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."
+ [[ $? -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 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "pool_list did not fail even though fsname was not mentioned."
+ [[ $? -ne 0 ]] || error "pool_list did not fail even though fsname missing."
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} 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "pool_list did not fail for a non-existant fsname $NON_EXISTANT_FS"
+ [[ $? -ne 0 ]] || error "pool_list did not fail for fsname $NON_EXISTANT_FS"
$LCMD pool_list ${FSNAME}.$NON_EXISTANT_POOL 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "pool_list did not fail for a non-existant pool $NON_EXISTANT_POOL"
+ [[ $? -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 2>/dev/null
- [[ $? -ne 0 ]] || \
+ [[ $? -ne 0 ]] ||
error "pool_list did not fail for invalid mountpoint ${DIR}nonexistant"
destroy_pool $POOL
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."
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 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "setstripe to invalid pool did not fail."
+ [[ $? -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 2>/dev/null
- [[ $? -ne 0 ]] || \
- error "setstripe to non-existant pool did not fail."
+ [[ $? -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 2>/dev/null
- [[ $? -ne 0 ]] || \
+ [[ $? -ne 0 ]] ||
error "$SETSTRIPE with start index outside the pool did not fail."
}
set_cleanup_trap
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
- [[ $OSTCOUNT -le 1 ]] && skip_env "Need atleast 2 OSTs" && return
+ [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
create_pool_nofail $POOL
create_pool_nofail $POOL2
- local start=$(printf %04x $((TGT_FIRST+1)))
+ local start=$(printf %04x $((TGT_FIRST + 1)))
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL2 \
$FSNAME-OST[$start-$TGT_MAX/2]
check_dir_in_pool $POOL_ROOT/dir1 $POOL
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
set_cleanup_trap
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
- [[ $OSTCOUNT -le 2 ]] && skip_env "Need atleast 3 OSTs" && return
+ [[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
create_pool_nofail $POOL
create_pool_nofail $POOL2
- local start=$(printf %04x $((TGT_FIRST+1)))
+ local start=$(printf %04x $((TGT_FIRST + 1)))
do_facet $SINGLEMDS lctl pool_add $FSNAME.$POOL2 \
$FSNAME-OST[$start-$TGT_MAX/2]
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
- FIRST_UUID=$(echo $TGT_UUID | awk '{print $1}')
+ 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/file1 "$TGT_LIST2"
check_file_in_osts $POOL_ROOT/file2 "$(seq 0x$start 2 0x$TGT_MAX)"
echo Creating some more files
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
- return 0
+ return 0
}
run_test 12 "OST Pool Membership"
test_13() {
set_cleanup_trap
- [[ $OSTCOUNT -le 2 ]] && skip_env "Need atleast 3 OSTs" && return
+ [[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
local numfiles=10
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))
+ 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))"
+ 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?
+ rm -rf $POOL_ROOT/dir[1-5]/
return 0
}
test_14() {
set_cleanup_trap
- [[ $OSTCOUNT -le 2 ]] && skip_env "Need atleast 3 OSTs" && return
+ [[ $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
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))
+ 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_pool $POOL_ROOT/dir1/file${i} $POOL
- i=$((i+1))
+ i=$((i + 1))
done
# Fill up OST0 until it is nearly full.
# Create 9 files of size OST0_SIZE/10 each.
create_dir $POOL_ROOT/dir2 $POOL2 1
$LFS df $POOL_ROOT/dir2
- echo "Filling up OST0"
- OST0_SIZE=`$LFS df $POOL_ROOT/dir2 | awk '/\[OST:0\]/ {print $4}'`
+ 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))
+ while [[ $i -lt 10 ]]; do
+ dd if=/dev/zero of=$POOL_ROOT/dir2/f${i} bs=1M count=$FILE_SIZE
+ i=$((i + 1))
done
+ 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
+
return 0
}
run_test 14 "Round robin and QOS striping within a pool"
local numfiles=100
local i=0
- while [[ $i -lt $OSTCOUNT ]]
- do
- create_pool_nofail pool${i}
+ while [[ $i -lt $OSTCOUNT ]]; do
+ create_pool_nofail $POOL${i}
- 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!"
+ 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!"
- for file in $POOL_ROOT/dir$i/*; do
- check_file_in_osts $file $i
- done
+ for file in $POOL_ROOT/dir$i/*; do
+ check_file_in_osts $file $i
+ done
- i=$((i+1))
+ i=$((i + 1))
done
return 0
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
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
destroy_pool $POOL
- createmany -o $dir/${tfile}2_ $numfiles || \
+ createmany -o $dir/${tfile}2_ $numfiles ||
error "createmany $dir/${tfile}2_ failed!"
rm -rf $dir
create_perf() {
local cdir=$1/d
- local numfiles=$2
+ local numsec=$2
local time
mkdir -p $cdir
- sync; sleep 5 # give pending IO a chance to go to disk
- stat=$(createmany -o $cdir/${tfile} $numfiles)
- rm -rf $cdir
sync
- time=$(echo $stat | cut -f 5 -d ' ')
- echo $stat >> /dev/stderr
- echo $time
+ 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
+
+ echo $files
}
test_18() {
set_cleanup_trap
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
- local numfiles=30000
+ local numsec=15
+ local iter=3
local plaindir=$POOL_ROOT/plaindir
local pooldir=$POOL_ROOT/pooldir
- local t1=0
- local t2=0
- local t3=0
- local diff
-
- for i in $(seq 1 3);
- do
- echo "Create performance, iteration $i, $numfiles files x 3"
-
- time1=$(create_perf $plaindir $numfiles)
- echo "iter $i: $numfiles creates without pool: $time1"
- t1=$(echo "scale=2; $t1 + $time1" | bc)
-
- create_pool_nofail $POOL > /dev/null
- add_pool $POOL $TGT_ALL "$TGT_UUID" > /dev/null
- create_dir $pooldir $POOL
- time2=$(create_perf $pooldir $numfiles)
- echo "iter $i: $numfiles creates with pool: $time2"
- t2=$(echo "scale=2; $t2 + $time2" | bc)
-
- destroy_pool $POOL > /dev/null
- time3=$(create_perf $pooldir $numfiles)
- echo "iter $i: $numfiles creates with missing pool: $time3"
- t3=$(echo "scale=2; $t3 + $time3" | bc)
-
- echo
- done
-
- time1=$(echo "scale=2; $t1 / $i" | bc)
- echo Avg time taken for $numfiles creates without pool: $time1
- time2=$(echo "scale=2; $t2 / $i" | bc)
- echo Avg time taken for $numfiles creates with pool: $time2
- time3=$(echo "scale=2; $t3 / $i" | bc)
- echo Avg time taken for $numfiles creates with missing pool: $time3
-
- # Set this high until we establish a baseline for what the degradation
- # is / should be
- max=30
- diff=$(echo "scale=2; ($time2 - $time1) * 100 / $time1" | bc)
- echo "No pool to wide pool: $diff %."
- deg=$(echo "scale=2; $diff > $max" | bc)
- [ "$deg" == "1" ] && error_ignore 23408 "Degradation with wide pool is $diff % (> $max %)"
-
- max=15
- diff=$(echo "scale=2; ($time3 - $time1) * 100 / $time1" | bc)
- echo "No pool to missing pool: $diff %."
- deg=$(echo "scale=2; $diff > $max" | bc)
- [ "$deg" == "1" ] && error_ignore 23408 "Degradation with missing pool is $diff % (> $max %)"
+ local f1=0
+ local f2=0
+ local f3=0
+ local diff
+
+ for i in $(seq 1 $iter); do
+ echo "Create performance, iteration $i, $numsec seconds x 3"
+
+ files1=$(create_perf $plaindir $numsec)
+ echo "iter $i: $files1 creates without pool"
+ f1=$(($f1 + $files1))
+
+ 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))
+
+ destroy_pool $POOL > /dev/null
+ files3=$(create_perf $pooldir $numsec)
+ echo "iter $i: $files3 creates with missing pool"
+ f3=$(($f3 + $files3))
+
+ echo
+ done
+
+ 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))
+
+ # 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%"
+
+ 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%"
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}
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
add_pool $POOL $TGT_HALF "$TGT_UUID2"
- 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)
+ 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
test_21() {
set_cleanup_trap
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
- [[ $OSTCOUNT -le 1 ]] && skip_env "Need atleast 2 OSTs" && return
+ [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
local numfiles=12
local i=0
echo loop for $pool
- for c in $(seq 1 10);
- do
+ for c in $(seq 1 10); do
echo "Pool $pool, iteration $c"
- do_facet $SINGLEMDS lctl pool_add $FSNAME.$pool OST[$TGT_FIRST-$TGT_MAX/$step] 2>/dev/null
- local TGT_SECOND=$(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
+ 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
}
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_env "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 || {
+ check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS || {
skip_env "User $RUNAS_ID does not exist - skipping"
return 0
}
local i=0
local TGT
- local BLK_SZ=1024
- local BUNIT_SZ=1024 # min block quota unit(kB)
- local LOVNAME=`lctl get_param -n llite.*.lov.common_name | tail -n 1`
- local OSTCOUNT=`lctl get_param -n lov.$LOVNAME.numobd`
- local LIMIT
+ local BUNIT_SZ=1024 # min block quota unit(kB)
+ local LIMIT=$((BUNIT_SZ * (OSTCOUNT + 1)))
local dir=$POOL_ROOT/dir
local file="$dir/$tfile-quota"
create_pool_nofail $POOL
- local TGT=$(for i in $(seq 0x$TGT_FIRST 3 0x$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
- LIMIT=$((BUNIT_SZ * (OSTCOUNT + 1)))
- $LFS setquota -u $TSTUSR -b $LIMIT -B $LIMIT $dir
+ $LFS setquota -u $RUNAS_ID -b $LIMIT -B $LIMIT $dir
sleep 3
- $LFS quota -v -u $TSTUSR $dir
+ $LFS quota -v -u $RUNAS_ID $dir
$LFS setstripe $file -c 1 -p $POOL
- chown $TSTUSR.$TSTUSR $file
+ chown $RUNAS_ID.$RUNAS_GID $file
ls -l $file
- type runas
- LOCALE=C $RUNAS dd if=/dev/zero of=$file bs=$BLK_SZ count=$((BUNIT_SZ*2)) || true
- $LFS quota -v -u $TSTUSR $dir
- cancel_lru_locks osc
- stat=$(LOCALE=C $RUNAS dd if=/dev/zero of=$file bs=$BLK_SZ count=$BUNIT_SZ seek=$((BUNIT_SZ*2)) 2>&1)
- RC=$?
- echo $stat
- [[ $RC -eq 0 ]] && error "dd did not fail with EDQUOT."
+ # 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
- [[ $? -eq 1 ]] && error "dd did not fail with EDQUOT."
- $LFS quota -v -u $TSTUSR $dir
+ 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"
+
+test_23b() {
+ set_cleanup_trap
+ local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
+ [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return 0
+
+ mkdir -p $POOL_ROOT
+ check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS || {
+ skip_env "User $RUNAS_ID does not exist - skipping"
+ return 0
+ }
+
+ local i=0
+ local TGT
+ local BUNIT_SZ=1024 # min block quota unit(kB)
+ local LIMIT=$((BUNIT_SZ * (OSTCOUNT + 1)))
+ local dir=$POOL_ROOT/dir
+ local file="$dir/$tfile-quota"
+
+ create_pool_nofail $POOL
+
+ 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
+
+ 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 "second run"
$LFS quotaoff -ug $MOUNT
- # $LFS setquota -u $TSTUSR -b $LIMIT -B $LIMIT $dir
- chown $TSTUSR.$TSTUSR $dir
+ chown $RUNAS_ID.$RUNAS_ID $dir
i=0
RC=0
- while [ $RC -eq 0 ];
- do
- i=$((i+1))
- stat=$(LOCALE=C $RUNAS2 dd if=/dev/zero of=${file}$i bs=1M \
- 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
+ while [ $RC -eq 0 ]; do
+ i=$((i + 1))
+ stat=$(LOCALE=C $RUNAS2 dd if=/dev/zero of=${file}$i bs=1M \
+ count=$((LIMIT * 4)) 2>&1)
+ RC=$?
+ echo "$i: $stat"
+ if [ $RC -eq 1 ]; then
+ echo $stat | grep "Disk quota exceeded"
+ [[ $? -eq 0 ]] && error "dd failed with EDQUOT with quota off"
+
+ echo $stat | grep "No space left on device"
+ [[ $? -ne 0 ]] &&
+ error "dd did not fail with ENOSPC"
+ fi
done
df -h
rm -rf $POOL_ROOT
-
- return 0
}
-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_env "Need atleast 2 OSTs" && return
+ [[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
local numfiles=10
local i=0
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 || \
+ $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 || \
+ $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=$(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
+ 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
mkdir -p $POOL_ROOT
for i in $(seq 10); do
- 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 " || \
- error "pool_add failed: $1; $2"
+ 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 || \
+ 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
+ wait_mds_ost_sync
# Veriy that the pool got created and is usable
df $POOL_ROOT > /dev/null
sleep 5
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
+ 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."
+ echo "OST 0 seems to be unavailable. Try later."
fi
done
rm -rf $POOL_ROOT
}
-run_test 25 "Create new pool and restart MDS ======================="
+run_test 25 "Create new pool and restart MDS"
test_26() {
- local OSTCOUNT=`lctl get_param -n lov.$LOVNAME.*clilov*.numobd`
[[ $OSTCOUNT -le 2 ]] && skip_env "Need at least 3 OSTs" && return
set_cleanup_trap
local dev=$(mdsdevname ${SINGLEMDS//mds/})
mkdir -p $POOL_ROOT
- create_pool_nofail $POOL
-
- do_facet $SINGLEMDS "lctl pool_add $FSNAME.pool1 OST0000; sync"
- wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.pool1 | \
- sort -u | grep $FSNAME-OST0000_UUID " "$FSNAME-OST0000_UUID" || \
- error "pool_add failed: $1; $2"
-
- do_facet $SINGLEMDS "lctl pool_add $FSNAME.pool1 OST0002; sync"
- wait_update $HOSTNAME "lctl get_param -n lov.$FSNAME-*.pools.pool1 | \
- sort -u | grep $FSNAME-OST0002_UUID" "$FSNAME-OST0002_UUID" || \
- error "pool_add failed: $1; $2"
-
+ 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 $POOL"
+ echo "Creating files in $POOL2"
- for ((i=0;i<10;i++)); do
- #OBD_FAIL_MDS_OSC_CREATE_FAIL 0x147
- #Fail OST0000 to make sure the objects create on the other ost in the pool
+ 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 $POOL 1 -1 || break
+ 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 $POOL || break
+ check_file_in_pool $POOL_ROOT/file$i $POOL2 || break
done
rm -rf $POOL_ROOT
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff