X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=d3a27c99a21408c0b03e45b0544f493e8ec1bef0;hp=92f4c4fbd0dad0d6b310d537cc0d9c0c605a14ac;hb=df19e89b6c2c5b355ab2156da99bebf939ee01fd;hpb=9d0536bc9accd32ba2d0d1b838c1f4f418312a40 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 92f4c4f..d3a27c9 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1,5 +1,6 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: trap 'print_summary && touch $TF_FAIL && \ echo "test-framework exiting on error"' ERR @@ -8,7 +9,7 @@ set -e 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 @@ -16,6 +17,10 @@ export GSS_PIPEFS=false export IDENTITY_UPCALL=default export QUOTA_AUTO=1 +# LOAD_LLOOP: LU-409: only load llite_lloop module if kernel < 2.6.32 or +# LOAD_LLOOP is true. LOAD_LLOOP is false by default. +export LOAD_LLOOP=${LOAD_LLOOP:-false} + #export PDSH="pdsh -S -Rssh -w" # function used by scripts run on remote nodes @@ -33,8 +38,13 @@ if [ -f "$EXCEPT_LIST_FILE" ]; then . $EXCEPT_LIST_FILE fi -[ -z "$MODPROBECONF" -a -f /etc/modprobe.conf ] && MODPROBECONF=/etc/modprobe.conf -[ -z "$MODPROBECONF" -a -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre +# check config files for options in decreasing order of preference +[ -z "$MODPROBECONF" -a -f /etc/modprobe.d/lustre.conf ] && + MODPROBECONF=/etc/modprobe.d/lustre.conf +[ -z "$MODPROBECONF" -a -f /etc/modprobe.d/Lustre ] && + MODPROBECONF=/etc/modprobe.d/Lustre +[ -z "$MODPROBECONF" -a -f /etc/modprobe.conf ] && + MODPROBECONF=/etc/modprobe.conf assert_DIR () { local failed="" @@ -117,40 +127,28 @@ init_test_env() { 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 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 - if [[ -z $LOGDIRSET ]]; then - export LOGDIR=${LOGDIR:-${TMP}/test_logs/}/$(date +%s) - export LOGDIRSET=true - fi - export HOSTNAME=${HOSTNAME:-`hostname`} + export LOGDIR=${LOGDIR:-${TMP}/test_logs/$(date +%s)} + export TESTLOG_PREFIX=$LOGDIR/$TESTSUITE + + export HOSTNAME=${HOSTNAME:-$(hostname -s)} 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) @@ -165,13 +163,17 @@ init_test_env() { 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"} [ ! -f "$LCTL" ] && export LCTL=$(which lctl) export LFS=${LFS:-"$LUSTRE/utils/lfs"} [ ! -f "$LFS" ] && export LFS=$(which lfs) + SETSTRIPE=${SETSTRIPE:-"$LFS setstripe"} + GETSTRIPE=${GETSTRIPE:-"$LFS getstripe"} + export L_GETIDENTITY=${L_GETIDENTITY:-"$LUSTRE/utils/l_getidentity"} if [ ! -f "$L_GETIDENTITY" ]; then if `which l_getidentity > /dev/null 2>&1`; then @@ -188,7 +190,11 @@ init_test_env() { [ ! -f "$TUNEFS" ] && export TUNEFS=$(which tunefs.lustre) export CHECKSTAT="${CHECKSTAT:-"checkstat -v"} " export LUSTRE_RMMOD=${LUSTRE_RMMOD:-$LUSTRE/scripts/lustre_rmmod} - [ ! -f "$LUSTRE_RMMOD" ] && export LUSTRE_RMMOD=$(which lustre_rmmod 2> /dev/null) + [ ! -f "$LUSTRE_RMMOD" ] && + export LUSTRE_RMMOD=$(which lustre_rmmod 2> /dev/null) + export LFS_MIGRATE=${LFS_MIGRATE:-$LUSTRE/scripts/lfs_migrate} + [ ! -f "$LFS_MIGRATE" ] && + export LFS_MIGRATE=$(which lfs_migrate 2> /dev/null) export FSTYPE=${FSTYPE:-"ldiskfs"} export NAME=${NAME:-local} export LGSSD=${LGSSD:-"$LUSTRE/utils/gss/lgssd"} @@ -258,6 +264,16 @@ init_test_env() { rm -f $TMP/*active } +version_code() { + # split arguments like "1.8.6-wc3" into "1", "8", "6", "wc3" + eval set -- $(tr "[:punct:]" " " <<< $*) + + echo -n $((($1 << 16) | ($2 << 8) | $3)) +} + +export LINUX_VERSION=$(uname -r | sed -e "s/[-.]/ /3" -e "s/ .*//") +export LINUX_VERSION_CODE=$(version_code ${LINUX_VERSION//\./ }) + case `uname -r` in 2.4.*) EXT=".o"; USE_QUOTA=no; [ ! "$CLIENTONLY" ] && FSTYPE=ext3;; *) EXT=".ko"; USE_QUOTA=yes;; @@ -265,7 +281,7 @@ esac module_loaded () { - /sbin/lsmod | grep -q $1 + /sbin/lsmod | grep -q "^\<$1\>" } # Load a module on the system where this is running. @@ -330,6 +346,20 @@ load_module() { fi } +llite_lloop_enabled() { + local n1=$(uname -r | cut -d. -f1) + local n2=$(uname -r | cut -d. -f2) + local n3=$(uname -r | cut -d- -f1 | cut -d. -f3) + + # load the llite_lloop module for < 2.6.32 kernels + if [[ $n1 -lt 2 ]] || [[ $n1 -eq 2 && $n2 -lt 6 ]] || \ + [[ $n1 -eq 2 && $n2 -eq 6 && $n3 -lt 32 ]] || \ + $LOAD_LLOOP; then + return 0 + fi + return 1 +} + load_modules_local() { if [ -n "$MODPROBE" ]; then # use modprobe @@ -348,7 +378,6 @@ load_modules_local() { load_module obdclass/obdclass load_module ptlrpc/ptlrpc load_module ptlrpc/gss/ptlrpc_gss - [ "$USE_QUOTA" = "yes" -a "$LQUOTA" != "no" ] && load_module quota/lquota $LQUOTAOPTS load_module fld/fld load_module fid/fid load_module lmv/lmv @@ -357,10 +386,16 @@ load_modules_local() { load_module lov/lov load_module mgc/mgc if ! client_only; then - grep -q crc16 /proc/kallsyms || { modprobe crc16 2>/dev/null || true; } - grep -q -w jbd /proc/kallsyms || { modprobe jbd 2>/dev/null || true; } - grep -q -w jbd2 /proc/kallsyms || { modprobe jbd2 2>/dev/null || true; } - [ "$FSTYPE" = "ldiskfs" ] && load_module ../ldiskfs/ldiskfs/ldiskfs + SYMLIST=/proc/kallsyms + grep -q crc16 $SYMLIST || { modprobe crc16 2>/dev/null || true; } + grep -q -w jbd $SYMLIST || { modprobe jbd 2>/dev/null || true; } + grep -q -w jbd2 $SYMLIST || { modprobe jbd2 2>/dev/null || true; } + if [ "$FSTYPE" = "ldiskfs" ]; then + grep -q exportfs_decode_fh $SYMLIST || + { modprobe exportfs 2> /dev/null || true; } + load_module ../ldiskfs/ldiskfs/ldiskfs + fi + [ "$USE_QUOTA" = "yes" -a "$LQUOTA" != "no" ] && load_module quota/lquota $LQUOTAOPTS load_module mgs/mgs load_module mds/mds load_module mdd/mdd @@ -369,18 +404,27 @@ load_modules_local() { load_module cmm/cmm load_module osd-ldiskfs/osd_ldiskfs load_module ost/ost - load_module obdfilter/obdfilter + if [ "x$USE_OFD" = "xyes" ]; then + load_module ofd/ofd + else + load_module obdfilter/obdfilter + fi fi + load_module llite/lustre - load_module llite/llite_lloop + llite_lloop_enabled && load_module llite/llite_lloop [ -d /r ] && OGDB=${OGDB:-"/r/tmp"} OGDB=${OGDB:-$TMP} rm -f $OGDB/ogdb-$HOSTNAME $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 () { @@ -422,6 +466,12 @@ unload_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." @@ -554,14 +604,71 @@ ostdevlabel() { echo -n $label } +set_debug_size () { + local dz=${1:-$DEBUG_SIZE} + + if [ -f /sys/devices/system/cpu/possible ]; then + local cpus=$(($(cut -d "-" -f 2 /sys/devices/system/cpu/possible)+1)) + else + local cpus=$(getconf _NPROCESSORS_CONF) + fi + + # bug 19944, adjust size to be -gt num_possible_cpus() + # promise 2MB for every cpu at least + if [ -n "$cpus" ] && [ $((cpus * 2)) -gt $dz ]; then + dz=$((cpus * 2)) + fi + lctl set_param debug_mb=$dz +} + +set_default_debug () { + local debug=${1:-"$PTLDEBUG"} + local subsys=${2:-"$SUBSYSTEM"} + local debug_size=${3:-$DEBUG_SIZE} + + [ -n "$debug" ] && lctl set_param debug="$debug" >/dev/null + [ -n "$subsys" ] && lctl set_param subsystem_debug="${subsys# }" >/dev/null + + [ -n "$debug_size" ] && set_debug_size $debug_size > /dev/null +} + +set_default_debug_nodes () { + local nodes=$1 + + if [[ ,$nodes, = *,$HOSTNAME,* ]]; then + nodes=$(exclude_items_from_list "$nodes" "$HOSTNAME") + set_default_debug + fi + + [[ -n $nodes ]] && do_rpc_nodes $nodes set_default_debug \ + \\\"$PTLDEBUG\\\" \\\"$SUBSYSTEM\\\" $DEBUG_SIZE || true +} + +set_default_debug_facet () { + local facet=$1 + local node=$(facet_active_host $facet) + [ -z "$node" ] && echo "No host defined for facet $facet" && exit 1 + + set_default_debug_nodes $node +} + # Facet functions mount_facets () { - local facets=${1:-$(get_facets)} - local facet + local facets=${1:-$(get_facets)} + local facet - for facet in ${facets//,/ }; do - mount_facet $facet || error "Restart of $facet failed!" - done + for facet in ${facets//,/ }; do + mount_facet $facet + local RC=$? + [ $RC -eq 0 ] && continue + + if [ "$TESTSUITE.$TESTNAME" = "replay-dual.test_0a" ]; then + skip "Restart of $facet failed!." && touch $LU482_FAILED + else + error "Restart of $facet failed!" + fi + return $RC + done } mount_facet() { @@ -574,14 +681,13 @@ mount_facet() { echo "Starting ${facet}: ${!opt} $@ ${!dev} $mntpt" do_facet ${facet} "mkdir -p $mntpt; mount -t lustre ${!opt} $@ ${!dev} $mntpt" RC=${PIPESTATUS[0]} + # to allow testing LU-482 error handling in mount_facets() and test_0a() + [ -f $TMP/test-lu482-trigger ] && RC=2 if [ $RC -ne 0 ]; then echo "mount -t lustre $@ ${!dev} $mntpt" echo "Start of ${!dev} on ${facet} failed ${RC}" else - do_facet ${facet} "lctl set_param debug=\\\"$PTLDEBUG\\\"; \ - lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\"; \ - lctl set_param debug_mb=${DEBUG_SIZE}; \ - sync" + set_default_debug_facet $facet label=$(do_facet ${facet} "$E2LABEL ${!dev}") [ -z "$label" ] && echo no label for ${!dev} && exit 1 @@ -625,7 +731,7 @@ stop() { local mntpt=$(facet_mntpt $facet) running=$(do_facet ${facet} "grep -c $mntpt' ' /proc/mounts") || true if [ ${running} -ne 0 ]; then - echo "Stopping $mntpt (opts:$@)" + echo "Stopping $mntpt (opts:$@) on $HOST" do_facet ${facet} umount -d $@ $mntpt fi @@ -734,9 +840,7 @@ zconf_mount() { do_node $client mkdir -p $mnt do_node $client mount -t lustre $OPTIONS $device $mnt || return 1 - do_node $client "lctl set_param debug=\\\"$PTLDEBUG\\\"; - lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\"; - lctl set_param debug_mb=${DEBUG_SIZE}" + set_default_debug_nodes $client return 0 } @@ -781,7 +885,7 @@ sanity_mount_check_nodes () { local rc=0 for mnt in $mnts ; do do_nodes $nodes "running=\\\$(grep -c $mnt' ' /proc/mounts); -mpts=\\\$(mount | grep -w -c $mnt); +mpts=\\\$(mount | grep -c $mnt' '); if [ \\\$running -ne \\\$mpts ]; then echo \\\$(hostname) env are INSANE!; exit 1; @@ -851,11 +955,9 @@ fi; exit \\\$rc" || return ${PIPESTATUS[0]} echo "Started clients $clients: " - do_nodes $clients "mount | grep -w $mnt" + do_nodes $clients "mount | grep $mnt' '" - do_nodes $clients "lctl set_param debug=\\\"$PTLDEBUG\\\"; - lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\"; - lctl set_param debug_mb=${DEBUG_SIZE};" + set_default_debug_nodes $clients return 0 } @@ -871,18 +973,16 @@ zconf_umount_clients() { do_nodes $clients "running=\\\$(grep -c $mnt' ' /proc/mounts); if [ \\\$running -ne 0 ] ; then echo Stopping client \\\$(hostname) $mnt opts:$force; -lsof -t $mnt || need_kill=no; +lsof $mnt || need_kill=no; if [ "x$force" != "x" -a "x\\\$need_kill" != "xno" ]; then pids=\\\$(lsof -t $mnt | sort -u); if [ -n \\\"\\\$pids\\\" ]; then kill -9 \\\$pids; fi fi; -busy=\\\$(umount $force $mnt 2>&1 | grep -c "busy"); -if [ \\\$busy -ne 0 ] ; then +while umount $force $mnt 2>&1 | grep -q "busy"; do echo "$mnt is still busy, wait one second" && sleep 1; - umount $force $mnt; -fi +done; fi" } @@ -1028,25 +1128,31 @@ check_progs_installed () { } # 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 \ - BREAK_ON_ERROR=$BREAK_ON_ERROR \ - END_RUN_FILE=$END_RUN_FILE \ - LOAD_PID_FILE=$LOAD_PID_FILE \ - TESTSUITELOG=$TESTSUITELOG \ - run_${load}.sh" & - CLIENT_LOAD_PIDS="$CLIENT_LOAD_PIDS $!" +BREAK_ON_ERROR=$BREAK_ON_ERROR \ +END_RUN_FILE=$END_RUN_FILE \ +LOAD_PID_FILE=$LOAD_PID_FILE \ +TESTLOG_PREFIX=$TESTLOG_PREFIX \ +TESTNAME=$TESTNAME \ +DBENCH_LIB=$DBENCH_LIB \ +DBENCH_SRC=$DBENCH_SRC \ +run_${load}.sh" & + local ppid=$! log "Started client load: ${load} on $client" + # get the children process IDs + local pids=$(ps --ppid $ppid -o pid= | xargs) + CLIENT_LOAD_PIDS="$CLIENT_LOAD_PIDS $ppid $pids" return 0 } @@ -1063,14 +1169,14 @@ start_client_loads () { sleep 2 } -# only for remote client +# 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 - + # bug 18914: try to connect several times not only when # check ps, but while check_catastrophe also local tries=3 @@ -1140,7 +1246,7 @@ restart_client_loads () { 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 @@ -1148,7 +1254,7 @@ restart_client_loads () { if [ "$rc" != 0 ]; then log "Client load failed to restart on node $client, rc=$rc" # failure one client load means test fail - # we do not need to check other + # we do not need to check other return $rc fi else @@ -1156,6 +1262,70 @@ restart_client_loads () { fi done } + +# Start vmstat and save its process ID in a file. +start_vmstat() { + local nodes=$1 + local pid_file=$2 + + [ -z "$nodes" -o -z "$pid_file" ] && return 0 + + do_nodes $nodes \ + "vmstat 1 > $TESTLOG_PREFIX.$TESTNAME.vmstat.\\\$(hostname -s).log \ + 2>/dev/null $pid_file" +} + +# Display the nodes on which client loads failed. +print_end_run_file() { + local file=$1 + local node + + [ -s $file ] || return 0 + + echo "Found the END_RUN_FILE file: $file" + cat $file + + # A client load will stop if it finds the END_RUN_FILE file. + # That does not mean the client load actually failed though. + # The first node in END_RUN_FILE is the one we are interested in. + read node < $file + + if [ -n "$node" ]; then + local var=$(node_var_name $node)_load + + local prefix=$TESTLOG_PREFIX + [ -n "$TESTNAME" ] && prefix=$prefix.$TESTNAME + local stdout_log=$prefix.run_${!var}_stdout.$node.log + local debug_log=$(echo $stdout_log | sed 's/\(.*\)stdout/\1debug/') + + echo "Client load ${!var} failed on node $node:" + echo "$stdout_log" + echo "$debug_log" + fi +} + +# Stop the process which had its PID saved in a file. +stop_process() { + local nodes=$1 + local pid_file=$2 + + [ -z "$nodes" -o -z "$pid_file" ] && return 0 + + do_nodes $nodes "test -f $pid_file && + { kill -s TERM \\\$(cat $pid_file); rm -f $pid_file; }" || true +} + +# Stop all client loads. +stop_client_loads() { + local nodes=${1:-$CLIENTS} + local pid_file=$2 + + # stop the client loads + stop_process $nodes $pid_file + + # clean up the processes that started them + [ -n "$CLIENT_LOAD_PIDS" ] && kill -9 $CLIENT_LOAD_PIDS 2>/dev/null || true +} # End recovery-scale functions # verify that lustre actually cleaned up properly @@ -1190,19 +1360,22 @@ wait_update () { local RESULT local WAIT=0 - local sleep=5 + local sleep=1 + local print=10 while [ true ]; do RESULT=$(do_node $node "$TEST") if [ "$RESULT" == "$FINAL" ]; then - echo "Updated after $WAIT sec: wanted '$FINAL' got '$RESULT'" + [ -z "$RESULT" -o $WAIT -le $sleep ] || + echo "Updated after ${WAIT}s: wanted '$FINAL' got '$RESULT'" return 0 fi [ $WAIT -ge $MAX ] && break - echo "Waiting $((MAX - WAIT)) secs for update" + [ $((WAIT % print)) -eq 0 ] && + echo "Waiting $((MAX - WAIT)) secs for update" WAIT=$((WAIT + sleep)) sleep $sleep done - echo "Update not seen after $MAX sec: wanted '$FINAL' got '$RESULT'" + echo "Update not seen after ${MAX}s: wanted '$FINAL' got '$RESULT'" return 3 } @@ -1455,6 +1628,14 @@ facet_failover() { echo "Failing $facet on node $host" + # Make sure the client data is synced to disk. LU-924 + # + # We don't write client data synchrnously (to avoid flooding sync writes + # when there are many clients connecting), so if the server reboots before + # the client data reachs disk, the client data will be lost and the client + # will be evicted after recovery, which is not what we expected. + do_facet $facet "sync; sync; sync" + local affected=$(affected_facets $facet) shutdown_facet $facet @@ -1483,7 +1664,7 @@ obd_name() { replay_barrier() { local facet=$1 - do_facet $facet sync + do_facet $facet "sync; sync; sync" df $MOUNT # make sure there will be no seq change @@ -1499,7 +1680,7 @@ replay_barrier() { replay_barrier_nodf() { local facet=$1 echo running=${running} - do_facet $facet sync + do_facet $facet "sync; sync; sync" local svc=${facet}_svc echo Replay barrier on ${!svc} do_facet $facet $LCTL --device %${!svc} notransno @@ -1542,6 +1723,7 @@ fail_abort() { local facet=$1 stop $facet change_active $facet + wait_for_facet $facet mount_facet $facet -o abort_recovery clients_up || echo "first df failed: $?" clients_up || error "post-failover df: $?" @@ -1552,6 +1734,18 @@ do_lmc() { exit 1 } +host_nids_address() { + local nodes=$1 + local kind=$2 + + if [ -n "$kind" ]; then + nids=$(do_nodes $nodes "$LCTL list_nids | grep $kind | cut -f 1 -d '@'") + else + nids=$(do_nodes $nodes "$LCTL list_nids all | cut -f 1 -d '@'") + fi + echo $nids +} + h2name_or_ip() { if [ "$1" = "client" -o "$1" = "'*'" ]; then echo \'*\'; else echo $1"@$2" @@ -1592,6 +1786,95 @@ h2o2ib() { } declare -fx h2o2ib +# This enables variables in cfg/"setup".sh files to support the pdsh HOSTLIST +# expressions format. As a bonus we can then just pass in those variables +# to pdsh. What this function does is take a HOSTLIST type string and +# expand it into a space deliminated list for us. +hostlist_expand() { + local hostlist=$1 + local offset=$2 + local myList + local item + local list + + [ -z "$hostlist" ] && return + + # Translate the case of [..],..,[..] to [..] .. [..] + list="${hostlist/],/] }" + front=${list%%[*} + [[ "$front" == *,* ]] && { + new="${list%,*} " + old="${list%,*}," + list=${list/${old}/${new}} + } + + for item in $list; do + # Test if we have any []'s at all + if [ "$item" != "${item/\[/}" ]; then { + # Expand the [*] into list + name=${item%%[*} + back=${item#*]} + + if [ "$name" != "$item" ]; then + group=${item#$name[*} + group=${group%%]*} + + for range in ${group//,/ }; do + begin=${range%-*} + end=${range#*-} + + # Number of leading zeros + padlen=${#begin} + padlen2=${#end} + end=$(echo $end | sed 's/0*//') + [[ -z "$end" ]] && end=0 + [[ $padlen2 -gt $padlen ]] && { + [[ $padlen2 -eq ${#end} ]] && padlen2=0 + padlen=$padlen2 + } + begin=$(echo $begin | sed 's/0*//') + [ -z $begin ] && begin=0 + + for num in $(seq -f "%0${padlen}g" $begin $end); do + value="${name#*,}${num}${back}" + [ "$value" != "${value/\[/}" ] && { + value=$(hostlist_expand "$value") + } + myList="$myList $value" + done + done + fi + } else { + myList="$myList $item" + } fi + done + myList=${myList//,/ } + myList=${myList:1} # Remove first character which is a space + + # Filter any duplicates without sorting + list="$myList " + myList="${list%% *}" + + while [[ "$list" != ${myList##* } ]]; do + list=${list//${list%% *} /} + myList="$myList ${list%% *}" + done + myList="${myList%* }"; + + # We can select an object at a offset in the list + [ $# -eq 2 ] && { + cnt=0 + for item in $myList; do + let cnt=cnt+1 + [ $cnt -eq $offset ] && { + myList=$item + } + done + [ $(get_node_count $myList) -ne 1 ] && myList="" + } + echo $myList +} + facet_host() { local facet=$1 @@ -1651,6 +1934,8 @@ change_active() { # save the active host for this facet local activevar=${facet}active echo "$activevar=${!activevar}" > $TMP/$activevar + [[ $facet = mds1 ]] && combined_mgs_mds && \ + echo "mgsactive=${!activevar}" > $TMP/mgsactive local TO=`facet_active_host $facet` echo "Failover $facet to $TO" done @@ -1675,7 +1960,7 @@ do_node() { 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 @@ -1747,9 +2032,10 @@ do_nodes() { [ -z "$myPDSH" -o "$myPDSH" = "no_dsh" -o "$myPDSH" = "rsh" ] && \ echo "cannot run remote command on $rnodes with $myPDSH" && return 128 + export FANOUT=$(get_node_count "${rnodes//,/ }") 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 @@ -1780,6 +2066,7 @@ add() { # make sure its not already running stop ${facet} -f rm -f $TMP/${facet}active + [[ $facet = mds1 ]] && combined_mgs_mds && rm -f $TMP/mgsactive do_facet ${facet} $MKFS $* } @@ -1801,6 +2088,8 @@ mdsdevname() { facet_mntpt () { local facet=$1 + [[ $facet = mgs ]] && combined_mgs_mds && facet="mds1" + local var=${facet}_MOUNT eval mntpt=${!var:-${MOUNT%/*}/$facet} @@ -1832,6 +2121,7 @@ stopall() { stop mds$num -f rm -f ${TMP}/mds${num}active done + combined_mgs_mds && rm -f $TMP/mgsactive for num in `seq $OSTCOUNT`; do stop ost$num -f @@ -2072,6 +2362,7 @@ setupall() { [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE mount_client $MOUNT [ -n "$CLIENTS" ] && zconf_mount_clients $CLIENTS $MOUNT + clients_up if [ "$MOUNT_2" ]; then mount_client $MOUNT2 @@ -2179,12 +2470,6 @@ osc_ensure_active () { } init_param_vars () { - if ! remote_ost_nodsh && ! remote_mds_nodsh; then - export MDSVER=$(do_facet $SINGLEMDS "lctl get_param version" | cut -d. -f1,2) - export OSTVER=$(do_facet ost1 "lctl get_param version" | cut -d. -f1,2) - export CLIVER=$(lctl get_param version | cut -d. -f 1,2) - fi - remote_mds_nodsh || TIMEOUT=$(do_facet $SINGLEMDS "lctl get_param -n timeout") @@ -2364,10 +2649,7 @@ check_and_setup_lustre() { init_facets_vars init_param_vars - do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=\\\"$PTLDEBUG\\\"; - lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\"; - lctl set_param debug_mb=${DEBUG_SIZE}; - sync" + set_default_debug_nodes $(comma_list $(nodes_list)) fi init_gss @@ -2446,11 +2728,10 @@ get_svr_devs() { 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=$? @@ -2459,34 +2740,38 @@ run_e2fsck() { return 0 } +# verify a directory is shared among nodes. +check_shared_dir() { + local dir=$1 + + [ -z "$dir" ] && return 1 + do_rpc_nodes $(comma_list $(nodes_list)) check_logdir $dir + check_write_access $dir || return 1 + return 0 +} + # Run e2fsck on MDT and OST(s) to generate databases used for lfsck. generate_db() { local i local ostidx local dev - local tmp_file - [ $MDSCOUNT -eq 1 ] || error "CMD is not supported" - tmp_file=$(mktemp -p $SHARED_DIRECTORY || - error "fail to create file in $SHARED_DIRECTORY") + check_shared_dir $SHARED_DIRECTORY || + error "$SHARED_DIRECTORY isn't a shared directory" - # make sure everything gets to the backing store - local list=$(comma_list $CLIENTS $(facet_host $SINGLEMDS) $(osts_nodes)) - do_nodes $list "sync; sleep 2; sync" + export MDSDB=$SHARED_DIRECTORY/mdsdb + export OSTDB=$SHARED_DIRECTORY/ostdb - do_nodes $list ls $tmp_file || \ - error "$SHARED_DIRECTORY is not a shared directory" - rm $tmp_file + [ $MDSCOUNT -eq 1 ] || error "CMD is not supported" - 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 @@ -2508,18 +2793,15 @@ run_lfsck() { } 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 - [ -n "$DIR" ] && rm -rf $DIR/[Rdfs][0-9]* + [ -n "$DIR" ] && rm -rf $DIR/[Rdfs][0-9]* || + error "remove sub-test dirs failed" [ "$ENABLE_QUOTA" ] && restore_quota_type || true fi @@ -2680,15 +2962,18 @@ at_is_enabled() { fi } -at_max_get() { +at_get() { local facet=$1 + local at=$2 - # suppose that all ost-s has the same at_max set - if [ $facet == "ost" ]; then - do_facet ost1 "lctl get_param -n at_max" - else - do_facet $facet "lctl get_param -n at_max" - fi + # suppose that all ost-s have the same $at value set + [ $facet != "ost" ] || facet=ost1 + + do_facet $facet "lctl get_param -n $at" +} + +at_max_get() { + at_get $1 at_max } at_max_set() { @@ -2696,20 +2981,17 @@ at_max_set() { shift local facet + local hosts for facet in $@; do if [ $facet == "ost" ]; then - for i in `seq $OSTCOUNT`; do - do_facet ost$i "lctl set_param at_max=$at_max" - - done + facet=$(get_facets OST) elif [ $facet == "mds" ]; then - for i in `seq $MDSCOUNT`; do - do_facet mds$i "lctl set_param at_max=$at_max" - done - else - do_facet $facet "lctl set_param at_max=$at_max" + facet=$(get_facets MDS) fi + hosts=$(expand_list $hosts $(facets_hosts $facet)) done + + do_nodes $hosts lctl set_param at_max=$at_max } ################################## @@ -2881,6 +3163,7 @@ error_noexit() { log " ${TESTSUITE} ${TESTNAME}: @@@@@@ ${TYPE}: $@ " + mkdir -p $LOGDIR # We need to dump the logs on all nodes if $dump; then gather_logs $(comma_list $(nodes_list)) @@ -2895,7 +3178,7 @@ exit_status () { local status=0 local log=$TESTSUITELOG - [ -f "$log" ] && grep -q FAIL $log && status=1 + [ -f "$log" ] && grep -q FAIL: $log && status=1 exit $status } @@ -3154,13 +3437,15 @@ run_one() { run_one_logged() { local BEFORE=`date +%s` local TEST_ERROR - local name=${TESTSUITE}.test_${1}.test_log.$(hostname).log + local name=${TESTSUITE}.test_${1}.test_log.$(hostname -s).log local test_log=$LOGDIR/$name rm -rf $LOGDIR/err + local SAVE_UMASK=`umask` + umask 0022 echo log_sub_test_begin test_${1} - (run_one $1 "$2") 2>&1 | tee $test_log + (run_one $1 "$2") 2>&1 | tee -i $test_log local RC=${PIPESTATUS[0]} [ $RC -ne 0 ] && [ ! -f $LOGDIR/err ] && \ @@ -3175,6 +3460,8 @@ run_one_logged() { $FAIL_ON_ERROR && exit $RC fi + umask $SAVE_UMASK + return 0 } @@ -3213,7 +3500,7 @@ check_grant() { # get server grant server_grant=`do_nodes $(comma_list $(osts_nodes)) \ - "$LCTL get_param -n obdfilter.${FSNAME}-OST*.tot_granted" | \ + "$LCTL get_param -n obdfilter.${FSNAME}-OST*.tot_granted" | awk '{total += $1} END{print total}'` # check whether client grant == server grant @@ -3244,7 +3531,22 @@ osc_to_ost() ostuuid_from_index() { - $LFS osts $2 | awk '/^'$1'/ { print $2 }' + $LFS osts $2 | sed -ne "/^$1: /s/.* \(.*\) .*$/\1/p" +} + +ostname_from_index() { + local uuid=$(ostuuid_from_index $1) + echo ${uuid/_UUID/} +} + +index_from_ostuuid() +{ + $LFS osts $2 | sed -ne "/${1}/s/\(.*\): .* .*$/\1/p" +} + +mdtuuid_from_index() +{ + $LFS mdts $2 | sed -ne "/^$1: /s/.* \(.*\) .*$/\1/p" } remote_node () { @@ -3373,19 +3675,20 @@ remote_nodes_list () { init_clients_lists () { # Sanity check: exclude the local client from RCLIENTS - local rclients=$(echo " $RCLIENTS " | sed -re "s/\s+$HOSTNAME\s+/ /g") + local clients=$(hostlist_expand "$RCLIENTS") + local rclients=$(exclude_items_from_list "$clients" $HOSTNAME) # Sanity check: exclude the dup entries - rclients=$(for i in $rclients; do echo $i; done | sort -u) + RCLIENTS=$(for i in ${rclients//,/ }; do echo $i; done | sort -u) - local clients="$SINGLECLIENT $HOSTNAME $rclients" + clients="$SINGLECLIENT $HOSTNAME $RCLIENTS" # Sanity check: exclude the dup entries from CLIENTS # for those configs which has SINGLCLIENT set to local client clients=$(for i in $clients; do echo $i; done | sort -u) - CLIENTS=`comma_list $clients` - local -a remoteclients=($rclients) + CLIENTS=$(comma_list $clients) + local -a remoteclients=($RCLIENTS) for ((i=0; $i<${#remoteclients[@]}; i++)); do varname=CLIENT$((i + 2)) eval $varname=${remoteclients[i]} @@ -3416,7 +3719,8 @@ is_patchless () } check_versions () { - [ "$MDSVER" = "$CLIVER" -a "$OSTVER" = "$CLIVER" ] + [ "$(lustre_version_code client)" = "$(lustre_version_code $SINGLEMDS)" -a \ + "$(lustre_version_code client)" = "$(lustre_version_code ost1)" ] } get_node_count() { @@ -3573,7 +3877,8 @@ inodes_available () { } mdsrate_inodes_available () { - echo $(($(inodes_available) - 1)) + local min_inodes=$(inodes_available) + echo $((min_inodes * 99 / 100)) } # reset llite stat counters @@ -3638,25 +3943,6 @@ exit \\\$rc;" fi } -# $1 node -# $2 file -# $3 $RUNAS -get_stripe_info() { - local tmp_file - - stripe_size=0 - stripe_count=0 - stripe_index=0 - tmp_file=$(mktemp) - - do_facet $1 $3 lfs getstripe -v $2 > $tmp_file - - stripe_size=`awk '$1 ~ /size/ {print $2}' $tmp_file` - stripe_count=`awk '$1 ~ /count/ {print $2}' $tmp_file` - stripe_index=`awk '$1 ~ /stripe_offset/ {print $2}' $tmp_file` - rm -f $tmp_file -} - # CMD: determine mds index where directory inode presents get_mds_dir () { local dir=$1 @@ -3715,26 +4001,17 @@ convert_facet2label() { } get_clientosc_proc_path() { - local ost=$1 - - echo "${1}-osc-*" + echo "${1}-osc-[^M]*" } get_lustre_version () { local facet=${1:-"$SINGLEMDS"} - do_facet $facet $LCTL get_param -n version | awk '/^lustre:/ {print $2}' -} - -get_mds_version_major () { - local facet=${1:-"$SINGLEMDS"} - local version=$(get_lustre_version $facet) - echo $version | awk -F. '{print $1}' + do_facet $facet $LCTL get_param -n version | awk '/^lustre:/ {print $2}' } -get_mds_version_minor () { +lustre_version_code() { local facet=${1:-"$SINGLEMDS"} - local version=$(get_lustre_version $facet) - echo $version | awk -F. '{print $2}' + version_code $(get_lustre_version $1) } # If the 2.0 MDS was mounted on 1.8 device, then the OSC and LOV names @@ -3743,10 +4020,8 @@ get_mds_version_minor () { # mdt osc: fsname-OSTXXXX-osc mds_on_old_device() { local mds=${1:-"$SINGLEMDS"} - local major=$(get_mds_version_major $mds) - local minor=$(get_mds_version_minor $mds) - if [ $major -ge 2 ] || [ $major -eq 1 -a $minor -gt 8 ]; then + if [ $(lustre_version_code $mds) -gt $(version_code 1.9.0) ]; then do_facet $mds "lctl list_param osc.$FSNAME-OST*-osc \ > /dev/null 2>&1" && return 0 fi @@ -3761,9 +4036,8 @@ get_mdtosc_proc_path() { local mdt_label=$(convert_facet2label $mds_facet) local mdt_index=$(echo $mdt_label | sed -e 's/^.*-//') - local major=$(get_mds_version_major $mds_facet) - local minor=$(get_mds_version_minor $mds_facet) - if [ $major -le 1 -a $minor -le 8 ] || mds_on_old_device $mds_facet; then + if [ $(lustre_version_code $mds_facet) -le $(version_code 1.8.0) ] || + mds_on_old_device $mds_facet; then echo "${ost_label}-osc" else echo "${ost_label}-osc-${mdt_index}" @@ -3787,12 +4061,19 @@ get_osc_import_name() { _wait_import_state () { local expected=$1 local CONN_PROC=$2 - local maxtime=${3:-max_recovery_time} + local maxtime=${3:-$(max_recovery_time)} local CONN_STATE local i=0 CONN_STATE=$($LCTL get_param -n $CONN_PROC 2>/dev/null | cut -f2) while [ "${CONN_STATE}" != "${expected}" ]; do + if [ "${expected}" == "DISCONN" ]; then + # for disconn we can check after proc entry is removed + [ "x${CONN_STATE}" == "x" ] && return 0 + # with AT enabled, we can have connect request timeout near of + # reconnect timeout and test can't see real disconnect + [ "${CONN_STATE}" == "CONNECTING" ] && return 0 + fi [ $i -ge $maxtime ] && \ error "can't put import for $CONN_PROC into ${expected} state after $i sec, have ${CONN_STATE}" && \ return 1 @@ -3808,43 +4089,75 @@ _wait_import_state () { wait_import_state() { local state=$1 local params=$2 - local maxtime=${3:-max_recovery_time} + local maxtime=${3:-$(max_recovery_time)} local param for param in ${params//,/ }; do _wait_import_state $state $param $maxtime || return done } + +# One client request could be timed out because server was not ready +# when request was sent by client. +# The request timeout calculation details : +# ptl_send_rpc () +# /* We give the server rq_timeout secs to process the req, and +# add the network latency for our local timeout. */ +# request->rq_deadline = request->rq_sent + request->rq_timeout + +# ptlrpc_at_get_net_latency(request) ; +# +# ptlrpc_connect_import () +# request->rq_timeout = INITIAL_CONNECT_TIMEOUT +# +# init_imp_at () -> +# -> at_init(&at->iat_net_latency, 0, 0) -> iat_net_latency=0 +# ptlrpc_at_get_net_latency(request) -> +# at_get (max (iat_net_latency=0, at_min)) = at_min +# +# i.e.: +# request->rq_timeout + ptlrpc_at_get_net_latency(request) = +# INITIAL_CONNECT_TIMEOUT + at_min +# +# We will use obd_timeout instead of INITIAL_CONNECT_TIMEOUT +# because we can not get this value in runtime, +# the value depends on configure options, and it is not stored in /proc. +# obd_support.h: +# #define CONNECTION_SWITCH_MIN 5U +# #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/20) + +request_timeout () { + local facet=$1 + + # request->rq_timeout = INITIAL_CONNECT_TIMEOUT + local init_connect_timeout=$TIMEOUT + [[ $init_connect_timeout -ge 5 ]] || init_connect_timeout=5 + + local at_min=$(at_get $facet at_min) + + echo $(( init_connect_timeout + at_min )) +} + wait_osc_import_state() { local facet=$1 local ost_facet=$2 local expected=$3 local ost=$(get_osc_import_name $facet $ost_facet) - local CONN_PROC - local CONN_STATE - local i=0 - CONN_PROC="osc.${ost}.ost_server_uuid" - CONN_STATE=$(do_facet $facet lctl get_param -n $CONN_PROC 2>/dev/null | cut -f2) - while [ "${CONN_STATE}" != "${expected}" ]; do - if [ "${expected}" == "DISCONN" ]; then - # for disconn we can check after proc entry is removed - [ "x${CONN_STATE}" == "x" ] && return 0 - # with AT we can have connect request timeout ~ reconnect timeout - # and test can't see real disconnect - [ "${CONN_STATE}" == "CONNECTING" ] && return 0 - fi - # disconnect rpc should be wait not more obd_timeout - [ $i -ge $(($TIMEOUT * 3 / 2)) ] && \ - error "can't put import for ${ost}(${ost_facet}) into ${expected} state" && return 1 - sleep 1 - CONN_STATE=$(do_facet $facet lctl get_param -n $CONN_PROC 2>/dev/null | cut -f2) - i=$(($i + 1)) - done + local param="osc.${ost}.ost_server_uuid" + + # 1. wait the deadline of client 1st request (it could be skipped) + # 2. wait the deadline of client 2nd request + local maxtime=$(( 2 * $(request_timeout $facet))) + + if ! do_rpc_nodes $(facet_host $facet) \ + _wait_import_state $expected $param $maxtime; then + error "import is not in ${expected} state" + return 1 + fi - log "${ost_facet} now in ${CONN_STATE} state" return 0 } + get_clientmdc_proc_path() { echo "${1}-mdc-*" } @@ -3989,7 +4302,7 @@ destroy_pools () { echo destroy the created pools: ${!listvar} for poolname in ${!listvar//,/ }; do - destroy_pool $fsname.$poolname + destroy_pool $fsname.$poolname done } @@ -4004,38 +4317,34 @@ gather_logs () { local ts=$(date +%s) local docp=true + + if [[ ! -f "$YAML_LOG" ]]; then + # init_logging is not performed before gather_logs, + # so the $LOGDIR needs to be checked here + check_shared_dir $LOGDIR && touch $LOGDIR/shared + fi + [ -f $LOGDIR/shared ] && docp=false - + # dump lustre logs, dmesg - prefix="$LOGDIR/${TESTSUITE}.${TESTNAME}" + prefix="$TESTLOG_PREFIX.$TESTNAME" suffix="$ts.log" echo "Dumping lctl log to ${prefix}.*.${suffix}" if [ "$CLIENTONLY" -o "$PDSH" == "no_dsh" ]; then echo "Dumping logs only on local client." - $LCTL dk > ${prefix}.debug_log.$(hostname).${suffix} - dmesg > ${prefix}.dmesg.$(hostname).${suffix} + $LCTL dk > ${prefix}.debug_log.$(hostname -s).${suffix} + dmesg > ${prefix}.dmesg.$(hostname -s).${suffix} return fi do_nodesv $list \ - "$LCTL dk > ${prefix}.debug_log.\\\$(hostname).${suffix}; - dmesg > ${prefix}.dmesg.\\\$(hostname).${suffix}" + "$LCTL dk > ${prefix}.debug_log.\\\$(hostname -s).${suffix}; + dmesg > ${prefix}.dmesg.\\\$(hostname -s).${suffix}" if [ ! -f $LOGDIR/shared ]; then do_nodes $list rsync -az "${prefix}.*.${suffix}" $HOSTNAME:$LOGDIR - fi - - local archive=$LOGDIR/${TESTSUITE}-$ts.tar.bz2 - tar -jcf $archive $LOGDIR/*$ts* $LOGDIR/*${TESTSUITE}* - - echo $archive -} - -cleanup_logs () { - local list=${1:-$(comma_list $(nodes_list))} - - [ -n ${TESTSUITE} ] && do_nodes $list "rm -f $TMP/*${TESTSUITE}*" || true + fi } do_ls () { @@ -4072,7 +4381,7 @@ do_ls () { max_recovery_time () { local init_connect_timeout=$(( TIMEOUT / 20 )) - [[ $init_connect_timeout > 5 ]] || init_connect_timeout=5 + [[ $init_connect_timeout -ge 5 ]] || init_connect_timeout=5 local service_time=$(( $(at_max_get client) + $(( 2 * $(( 25 + 1 + init_connect_timeout)) )) )) @@ -4311,7 +4620,7 @@ wait_flavor() echo -n "checking $dir..." res=$(do_check_flavor $dir $flavor) echo "found $res/$expect $flavor connections" - [ $res -eq $expect ] && return 0 + [ $res -ge $expect ] && return 0 sleep 4 done @@ -4380,18 +4689,23 @@ check_logdir() { # Not found. Create local logdir mkdir -p $dir else - touch $dir/node.$(hostname).yml + touch $dir/check_file.$(hostname -s) fi return 0 } check_write_access() { local dir=$1 + local node + local file + for node in $(nodes_list); do - if [ ! -f "$dir/node.${node}.yml" ]; then + file=$dir/check_file.$(short_hostname $node) + if [[ ! -f "$file" ]]; then # Logdir not accessible/writable from this node. return 1 fi + rm -f $file || return 1 done return 0 } @@ -4400,20 +4714,26 @@ init_logging() { if [[ -n $YAML_LOG ]]; then return fi + local SAVE_UMASK=`umask` + umask 0000 + export YAML_LOG=${LOGDIR}/results.yml mkdir -p $LOGDIR init_clients_lists - do_rpc_nodes $(comma_list $(nodes_list)) check_logdir $LOGDIR - if check_write_access $LOGDIR; then - touch $LOGDIR/shared - echo "Logging to shared log directory: $LOGDIR" - else - echo "Logging to local directory: $LOGDIR" + if [ ! -f $YAML_LOG ]; then # If the yaml log already exists then we will just append to it + if check_shared_dir $LOGDIR; then + touch $LOGDIR/shared + echo "Logging to shared log directory: $LOGDIR" + else + echo "Logging to local directory: $LOGDIR" + fi + + yml_nodes_file $LOGDIR >> $YAML_LOG + yml_results_file >> $YAML_LOG fi - yml_nodes_file $LOGDIR >> $YAML_LOG - yml_results_file >> $YAML_LOG + umask $SAVE_UMASK } log_test() { @@ -4435,6 +4755,7 @@ log_sub_test_end() { run_llverdev() { local dev=$1 + local llverdev_opts=$2 local devname=$(basename $1) local size=$(grep "$devname"$ /proc/partitions | awk '{print $3}') # loop devices aren't in /proc/partitions @@ -4444,10 +4765,24 @@ run_llverdev() local partial_arg="" # Run in partial (fast) mode if the size - # of a partition > 10 GB - [ $size -gt 10 ] && partial_arg="-p" + # of a partition > 1 GB + [ $size -gt 1 ] && partial_arg="-p" - llverdev --force $partial_arg $dev + llverdev --force $partial_arg $llverdev_opts $dev +} + +run_llverfs() +{ + local dir=$1 + local llverfs_opts=$2 + local partial_arg="" + local size=$(df -B G $dir |tail -n 1 |awk '{print $2}' |sed 's/G//') #GB + + # Run in partial (fast) mode if the size + # of a partition > 1 GB + [ $size -gt 1 ] && partial_arg="-p" + + llverfs $partial_arg $llverfs_opts $dir } remove_mdt_files() { @@ -4455,7 +4790,7 @@ remove_mdt_files() { local mdtdev=$2 shift 2 local files="$@" - local mntpt=${MOUNT%/*}/$facet + local mntpt=$(facet_mntpt $facet) echo "removing files from $mdtdev on $facet: $files" mount -t $FSTYPE $MDS_MOUNT_OPTS $mdtdev $mntpt || return $? @@ -4472,7 +4807,7 @@ duplicate_mdt_files() { local mdtdev=$2 shift 2 local files="$@" - local mntpt=${MOUNT%/*}/$facet + local mntpt=$(facet_mntpt $facet) echo "duplicating files on $mdtdev on $facet: $files" mkdir -p $mntpt || return $? @@ -4541,3 +4876,55 @@ min_ost_size () { $LCTL get_param -n osc.*.kbytesavail | sort -n | head -n1 } +# Get the block size of the filesystem. +get_block_size() { + local facet=$1 + local device=$2 + local size + + size=$(do_facet $facet "$DUMPE2FS -h $device 2>&1" | + awk '/^Block size:/ {print $3}') + echo $size +} + +# Check whether the "large_xattr" feature is enabled or not. +large_xattr_enabled() { + local mds_dev=$(mdsdevname ${SINGLEMDS//mds/}) + + do_facet $SINGLEMDS "$DUMPE2FS -h $mds_dev 2>&1 | grep -q large_xattr" + return ${PIPESTATUS[0]} +} + +# Get the maximum xattr size supported by the filesystem. +max_xattr_size() { + local size + + if large_xattr_enabled; then + # include/linux/limits.h: #define XATTR_SIZE_MAX 65536 + size=65536 + else + local mds_dev=$(mdsdevname ${SINGLEMDS//mds/}) + local block_size=$(get_block_size $SINGLEMDS $mds_dev) + + # maximum xattr size = size of block - size of header - + # size of 1 entry - 4 null bytes + size=$((block_size - 32 - 32 - 4)) + fi + + echo $size +} + +# Dump the value of the named xattr from a file. +get_xattr_value() { + local xattr_name=$1 + local file=$2 + + echo "$(getfattr -n $xattr_name --absolute-names --only-values $file)" +} + +# Generate a string with size of $size bytes. +generate_string() { + local size=${1:-1024} # in bytes + + echo "$(head -c $size < /dev/zero | tr '\0' y)" +}