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 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
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
+ # This is used by a small number of tests to share state between the client
+ # running the tests, or in some cases between the servers (e.g. lfsck.sh).
+ # It needs to be a non-lustre filesystem that is available on all the nodes.
+ export SHARED_DIRECTORY=${SHARED_DIRECTORY:-"/tmp"}
+ export MDSDB=${MDSDB:-$SHARED_DIRECTORY/mdsdb}
+ export OSTDB=${OSTDB:-$SHARED_DIRECTORY/ostdb}
+
#[ -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
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
load_module obdfilter/obdfilter
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 () {
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."
echo -n $label
}
+set_debug_size () {
+ local dz=${1:-$DEBUG_SIZE}
+ local cpus=$(getconf _NPROCESSORS_CONF)
+
+ # 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 subsystem_debug=${2:-"$SUBSYSTEM"}
+ local debug_size=${3:-$DEBUG_SIZE}
+
+ lctl set_param debug="$debug"
+ lctl set_param subsystem_debug="${subsystem_debug# }"
+
+ set_debug_size $debug_size
+ sync
+}
+
+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)}
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
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
}
echo "Started clients $clients: "
do_nodes $clients "mount | grep -w $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
}
}
# 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
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
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
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: $?"
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"
# 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
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
# 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 $*
}
facet_mntpt () {
local facet=$1
+ [[ $facet = mgs ]] && combined_mgs_mds && facet="mds1"
+
local var=${facet}_MOUNT
eval mntpt=${!var:-${MOUNT%/*}/$facet}
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
# 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
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
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
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() {
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
}
##################################
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
}
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}
$FAIL_ON_ERROR && exit $RC
fi
+ umask $SAVE_UMASK
+
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`)
}
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"
}
remote_node () {
}
mdsrate_inodes_available () {
- echo $(($(inodes_available) - 1))
+ local min_inodes=$(inodes_available)
+ echo $((min_inodes * 99 / 100))
}
# reset llite stat counters
}
get_clientosc_proc_path() {
- local ost=$1
-
- echo "${1}-osc-*"
+ echo "${1}-osc-[^M]*"
}
get_lustre_version () {
_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
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
+# #ifndef CRAY_XT3
+# #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/20)
+# #else
+# #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/2)
+
+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-*"
}
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
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)) )) ))
# Not found. Create local logdir
mkdir -p $dir
else
- touch $dir/node.$(hostname).yml
+ touch $dir/node.$(hostname -s).yml
fi
return 0
}
check_write_access() {
local dir=$1
for node in $(nodes_list); do
- if [ ! -f "$dir/node.${node}.yml" ]; then
+ if [ ! -f "$dir/node.$(short_hostname ${node}).yml" ]; then
# Logdir not accessible/writable from this node.
return 1
fi
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
echo "Logging to local directory: $LOGDIR"
fi
- yml_nodes_file $LOGDIR
+ yml_nodes_file $LOGDIR >> $YAML_LOG
yml_results_file >> $YAML_LOG
+
+ umask $SAVE_UMASK
}
log_test() {
}
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()
{
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
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() {
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 $?
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 $?
min_ost_size () {
$LCTL get_param -n osc.*.kbytesavail | sort -n | head -n1
}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff