export REFORMAT=${REFORMAT:-""}
export WRITECONF=${WRITECONF:-""}
-export VERBOSE=false
+export VERBOSE=${VERBOSE:-false}
export CATASTROPHE=${CATASTROPHE:-/proc/sys/lnet/catastrophe}
export GSS=false
export GSS_KRB5=false
export DUMPE2FS=${DUMPE2FS:-dumpe2fs}
export E2FSCK=${E2FSCK:-e2fsck}
export LFSCK_BIN=${LFSCK_BIN:-lfsck}
- export LFSCK_ALWAYS=${LFSCK_ALWAYS:-"no"} # check filesystem after each test suit
- export SKIP_LFSCK=${SKIP_LFSCK:-"yes"} # bug 13698, change to "no" when fixed
- export SHARED_DIRECTORY=${SHARED_DIRECTORY:-"/tmp"}
+
+ export LFSCK_ALWAYS=${LFSCK_ALWAYS:-"no"} # check fs after each test suite
export FSCK_MAX_ERR=4 # File system errors left uncorrected
- if [ "$SKIP_LFSCK" == "no" ]; then
- if [ ! -x `which $LFSCK_BIN` ]; then
- log "$($E2FSCK -V)"
- error_exit "$E2FSCK does not support lfsck"
- fi
+ export SHARED_DIRECTORY=${SHARED_DIRECTORY:-"/tmp"}
+ export MDSDB=${MDSDB:-$SHARED_DIRECTORY/mdsdb}
+ export OSTDB=${OSTDB:-$SHARED_DIRECTORY/ostdb}
- export MDSDB=${MDSDB:-$SHARED_DIRECTORY/mdsdb}
- export OSTDB=${OSTDB:-$SHARED_DIRECTORY/ostdb}
- export MDSDB_OPT="--mdsdb $MDSDB"
- export OSTDB_OPT="--ostdb $OSTDB-\$ostidx"
- fi
#[ -d /r ] && export ROOT=${ROOT:-/r}
export TMP=${TMP:-$ROOT/tmp}
export TESTSUITELOG=${TMP}/${TESTSUITE}.log
fi
export HOSTNAME=${HOSTNAME:-`hostname`}
if ! echo $PATH | grep -q $LUSTRE/utils; then
- export PATH=$PATH:$LUSTRE/utils
+ export PATH=$LUSTRE/utils:$PATH
fi
if ! echo $PATH | grep -q $LUSTRE/utils/gss; then
- export PATH=$PATH:$LUSTRE/utils/gss
+ export PATH=$LUSTRE/utils/gss:$PATH
fi
if ! echo $PATH | grep -q $LUSTRE/tests; then
export PATH=$LUSTRE/tests:$PATH
fi
if ! echo $PATH | grep -q $LUSTRE/../lustre-iokit/sgpdd-survey; then
- export PATH=$PATH:$LUSTRE/../lustre-iokit/sgpdd-survey
+ export PATH=$LUSTRE/../lustre-iokit/sgpdd-survey:$PATH
fi
export LST=${LST:-"$LUSTRE/../lnet/utils/lst"}
[ ! -f "$LST" ] && export LST=$(which lst)
export PATH=$LUSTRE/tests/racer:$PATH:
fi
if ! echo $PATH | grep -q $LUSTRE/tests/mpi; then
- export PATH=$PATH:$LUSTRE/tests/mpi
+ export PATH=$LUSTRE/tests/mpi:$PATH
fi
export RSYNC_RSH=${RSYNC_RSH:-rsh}
export LCTL=${LCTL:-"$LUSTRE/utils/lctl"}
module_loaded () {
- /sbin/lsmod | grep -q $1
+ /sbin/lsmod | grep -q "^\<$1\>"
}
# Load a module on the system where this is running.
eval set -- \$$optvar
if [ $# -eq 0 -a -n "$MODPROBECONF" ]; then
# Nothing in $MODOPTS_<MODULE>; try modprobe.conf
- set -- $(grep "^options\\s*\<${module}\>" $MODPROBECONF)
+ set -- $(grep -P "^options\\s+${BASE}" $MODPROBECONF)
# Get rid of "options $module"
(($# > 0)) && shift 2
$LCTL modules > $OGDB/ogdb-$HOSTNAME
# 'mount' doesn't look in $PATH, just sbin
- [ -f $LUSTRE/utils/mount.lustre ] && cp $LUSTRE/utils/mount.lustre /sbin/. || true
+ if [ -f $LUSTRE/utils/mount.lustre ] && \
+ ! grep -qe "/sbin/mount\.lustre " /proc/mounts; then
+ [ ! -f /sbin/mount.lustre ] && touch /sbin/mount.lustre
+ mount --bind $LUSTRE/utils/mount.lustre /sbin/mount.lustre || true
+ fi
}
load_modules () {
fi
fi
+ if grep -qe "/sbin/mount\.lustre" /proc/mounts; then
+ umount /sbin/mount.lustre || true
+ [ -w /sbin/mount.lustre -a ! -s /sbin/mount.lustre ] && \
+ rm -f /sbin/mount.lustre || true
+ fi
+
check_mem_leak || return 254
echo "modules unloaded."
}
zconf_mount() {
- local OPTIONS
local client=$1
local mnt=$2
- # Only supply -o to mount if we have options
- if [ -n "$MOUNTOPT" ]; then
- OPTIONS="-o $MOUNTOPT"
- fi
+ local OPTIONS=${3:-$MOUNTOPT}
+
local device=$MGSNID:/$FSNAME
if [ -z "$mnt" -o -z "$FSNAME" ]; then
echo Bad zconf mount command: opt=$OPTIONS dev=$device mnt=$mnt
local mnt=$2
local OPTIONS=${3:-$MOUNTOPT}
- # Only supply -o to mount if we have options
- if [ "$OPTIONS" ]; then
- OPTIONS="-o $OPTIONS"
- fi
local device=$MGSNID:/$FSNAME
if [ -z "$mnt" -o -z "$FSNAME" ]; then
echo Bad zconf mount command: opt=$OPTIONS dev=$device mnt=$mnt
}
# recovery-scale functions
-client_var_name() {
- echo __$(echo $1 | tr '-' 'X')
+node_var_name() {
+ echo __$(echo $1 | tr '-' '_' | tr '.' '_')
}
start_client_load() {
local client=$1
local load=$2
- local var=$(client_var_name $client)_load
+ local var=$(node_var_name $client)_load
eval export ${var}=$load
do_node $client "PATH=$PATH MOUNT=$MOUNT ERRORS_OK=$ERRORS_OK \
# only for remote client
check_client_load () {
local client=$1
- local var=$(client_var_name $client)_load
+ local var=$(node_var_name $client)_load
local TESTLOAD=run_${!var}.sh
ps auxww | grep -v grep | grep $client | grep -q "$TESTLOAD" || return 1
check_client_load $client
rc=${PIPESTATUS[0]}
if [ "$rc" != 0 -a "$expectedfail" ]; then
- local var=$(client_var_name $client)_load
+ local var=$(node_var_name $client)_load
start_client_load $client ${!var}
echo "Restarted client load ${!var}: on $client. Checking ..."
check_client_load $client
fi
if $VERBOSE; then
echo "CMD: $HOST $@" >&2
- $myPDSH $HOST $LCTL mark "$@" > /dev/null 2>&1 || :
+ $myPDSH $HOST "$LCTL mark \"$@\"" > /dev/null 2>&1 || :
fi
if [ "$myPDSH" = "rsh" ]; then
if $VERBOSE; then
echo "CMD: $rnodes $@" >&2
- $myPDSH $rnodes $LCTL mark "$@" > /dev/null 2>&1 || :
+ $myPDSH $rnodes "$LCTL mark \"$@\"" > /dev/null 2>&1 || :
fi
# do not replace anything from pdsh output if -N is used
# FIXME: remove hostname when 19215 fixed
do_nodes $clients "echo \\\$(hostname); grep ' '$MOUNT' ' /proc/mounts"
declare -a nfsexport=(`grep ' '$MOUNT' ' /proc/mounts | awk '{print $1}' | awk -F: '{print $1 " " $2}'`)
+ if [[ ${#nfsexport[@]} -eq 0 ]]; then
+ error_exit NFSCLIENT=$NFSCLIENT mode, but no NFS export found!
+ fi
do_nodes ${nfsexport[0]} "echo \\\$(hostname); df -T ${nfsexport[1]}"
return
fi
run_e2fsck() {
local node=$1
local target_dev=$2
- local ostidx=$3
- local ostdb_opt=$4
+ local extra_opts=$3
df > /dev/null # update statfs data on disk
- local cmd="$E2FSCK -d -v -f -n $MDSDB_OPT $ostdb_opt $target_dev"
+ local cmd="$E2FSCK -d -v -t -t -f -n $extra_opts $target_dev"
echo $cmd
local rc=0
do_node $node $cmd || rc=$?
error "$SHARED_DIRECTORY is not a shared directory"
rm $tmp_file
- run_e2fsck $(mdts_nodes) $MDTDEV
+ run_e2fsck $(mdts_nodes) $MDTDEV "--mdsdb $MDSDB"
i=0
ostidx=0
OSTDB_LIST=""
for node in $(osts_nodes); do
for dev in ${OSTDEVS[i]}; do
- local ostdb_opt=`eval echo $OSTDB_OPT`
- run_e2fsck $node $dev $ostidx "$ostdb_opt"
+ run_e2fsck $node $dev "--mdsdb $MDSDB --ostdb $OSTDB-$ostidx"
OSTDB_LIST="$OSTDB_LIST $OSTDB-$ostidx"
ostidx=$((ostidx + 1))
done
}
check_and_cleanup_lustre() {
- if [ "$LFSCK_ALWAYS" = "yes" ]; then
+ if [ "$LFSCK_ALWAYS" = "yes" -a "$TESTSUITE" != "lfsck" ]; then
get_svr_devs
generate_db
- if [ "$SKIP_LFSCK" == "no" ]; then
- run_lfsck
- else
- echo "skip lfsck"
- fi
+ run_lfsck
fi
if is_mounted $MOUNT; then
local status=0
local log=$TESTSUITELOG
- [ -f "$log" ] && grep -q FAIL $log && status=1
+ [ -f "$log" ] && grep -q FAIL: $log && status=1
exit $status
}
skip () {
echo
log " SKIP: ${TESTSUITE} ${TESTNAME} $@"
+ [ "$ALWAYS_SKIPPED" ] && \
+ skip_logged ${TESTNAME} "$@" || true
[ "$TESTSUITELOG" ] && \
echo "${TESTSUITE}: SKIP: $TESTNAME $@" >> $TESTSUITELOG || true
}
log "excepting tests: `echo $EXCEPT $ALWAYS_EXCEPT`"
[ "$EXCEPT_SLOW" ] && \
log "skipping tests SLOW=no: `echo $EXCEPT_SLOW`"
- for E in $EXCEPT $ALWAYS_EXCEPT; do
+ for E in $EXCEPT; do
eval EXCEPT_${E}=true
done
+ for E in $ALWAYS_EXCEPT; do
+ eval EXCEPT_ALWAYS_${E}=true
+ done
for E in $EXCEPT_SLOW; do
eval EXCEPT_SLOW_${E}=true
done
# print a newline if the last test was skipped
export LAST_SKIPPED=
+export ALWAYS_SKIPPED=
#
# Main entry into test-framework. This is called with the name and
# description of a test. The name is used to find the function to run
TESTNAME=test_$1 skip "skipping excluded test $1 (base $base)"
return 0
fi
+ testname=EXCEPT_ALWAYS_$1
+ if [ ${!testname}x != x ]; then
+ LAST_SKIPPED="y"
+ ALWAYS_SKIPPED="y"
+ TESTNAME=test_$1 skip "skipping ALWAYS excluded test $1"
+ return 0
+ fi
+ testname=EXCEPT_ALWAYS_$base
+ if [ ${!testname}x != x ]; then
+ LAST_SKIPPED="y"
+ ALWAYS_SKIPPED="y"
+ TESTNAME=test_$1 skip "skipping ALWAYS excluded test $1 (base $base)"
+ return 0
+ fi
testname=EXCEPT_SLOW_$1
if [ ${!testname}x != x ]; then
LAST_SKIPPED="y"
fi
LAST_SKIPPED=
+ ALWAYS_SKIPPED=
run_one_logged $1 "$2"
return $?
}
check_mds() {
- FFREE=$(do_node $SINGLEMDS lctl get_param -n osd.*MDT*.filesfree | awk 'BEGIN{avail=0}; {avail+=$1}; END{print avail}')
- FTOTAL=$(do_node $SINGLEMDS lctl get_param -n osd.*MDT*.filestotal | awk 'BEGIN{avail=0}; {avail+=$1}; END{print avail}')
+ local FFREE=$(do_node $SINGLEMDS \
+ lctl get_param -n osd*.*MDT*.filesfree | calc_sum)
+ local FTOTAL=$(do_node $SINGLEMDS \
+ lctl get_param -n osd*.*MDT*.filestotal | calc_sum)
+
[ $FFREE -ge $FTOTAL ] && error "files free $FFREE > total $FTOTAL" || true
}
return 0
}
+#
+# Print information of skipped tests to result.yml
+#
+skip_logged(){
+ log_sub_test_begin $1
+ log_sub_test_end "SKIP" "0" "0" "\"$2\""
+}
+
canonical_path() {
(cd `dirname $1`; echo $PWD/`basename $1`)
}
echo "Logging to local directory: $LOGDIR"
fi
- yml_nodes_file $LOGDIR
+ yml_nodes_file $LOGDIR >> $YAML_LOG
yml_results_file >> $YAML_LOG
}
}
log_sub_test_begin() {
- yml_log_sub_test_begin $@ >> $YAML_LOG
+ yml_log_sub_test_begin "$@" >> $YAML_LOG
}
log_sub_test_end() {
- yml_log_sub_test_end $@ >> $YAML_LOG
+ yml_log_sub_test_end "$@" >> $YAML_LOG
}
run_llverdev()
return 1
}
+min_ost_size () {
+ $LCTL get_param -n osc.*.kbytesavail | sort -n | head -n1
+}
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff