Skip to content
Snippets Groups Projects
Commit d4397cff authored by Elena Gryaznova's avatar Elena Gryaznova
Browse files

b=12649

i=Adilger
t-f helper nodes_list(); add debug marker on all nodes instead of client only

b=13698
i=Tappro
i=Adilger

disable LFSCK test
parent 2718e71d
No related merge requests found
......@@ -32,6 +32,7 @@ if [ "$ACC_SM_ONLY" ]; then
export ${O}="yes"
done
fi
LFSCK="no" # bug 13698
LIBLUSTRETESTS=${LIBLUSTRETESTS:-../liblustre/tests}
......@@ -52,8 +53,7 @@ setup_if_needed() {
}
title() {
echo "-----============= acceptance-small: "$*" ============-----"
$LCTL mark "----===== $* =====----" 2> /dev/null || true
log "-----============= acceptance-small: "$*" ============----- `date`"
RANTEST=${RANTEST}$*", "
}
......
......@@ -1065,12 +1065,14 @@ error() {
local ERRLOG
sysctl -w lustre.fail_loc=0 2> /dev/null || true
log "${TESTSUITE} ${TESTNAME}: **** ${TYPE}:" $@
log " ${TESTSUITE} ${TESTNAME}: @@@@@@ ${TYPE}: $@ "
ERRLOG=$TMP/lustre_${TESTSUITE}_${TESTNAME}.$(date +%s)
echo "Dumping lctl log to $ERRLOG"
# We need to dump the logs on all nodes
$LCTL dk $ERRLOG
[ ! "$mds_HOST" = "$(hostname)" ] && do_node $mds_HOST $LCTL dk $ERRLOG
[ ! "$ost_HOST" = "$(hostname)" -a ! "$ost_HOST" = "$mds_HOST" ] && do_node $ost_HOST $LCTL dk $ERRLOG
local NODES=$(nodes_list)
for NODE in $NODES; do
do_node $NODE $LCTL dk $ERRLOG
done
debugrestore
[ "$TESTSUITELOG" ] && echo "$0: ${TYPE}: $TESTNAME $@" >> $TESTSUITELOG
if $FAIL_ON_ERROR; then
......@@ -1156,7 +1158,16 @@ equals_msg() {
log() {
echo "$*"
lsmod | grep lnet > /dev/null || load_modules
$LCTL mark "$*" 2> /dev/null || true
local MSG="$*"
# Get rif of '
MSG=${MSG//\'/\\\'}
MSG=${MSG//\(/\\\(}
MSG=${MSG//\)/\\\)}
local NODES=$(nodes_list)
for NODE in $NODES; do
do_node $NODE $LCTL mark "$MSG" 2> /dev/null || true
done
}
trace() {
......@@ -1280,6 +1291,51 @@ remote_ost ()
[ $(grep -c obdfilter $LPROC/devices) -eq 0 ]
}
mdts_nodes () {
local MDSNODES=$(facet_host $SINGLEMDS)
# FIXME: Currenly we use only $SINGLEMDS,
# should be fixed when we will start to test cmd.
echo $MDSNODES
return
for num in `seq $MDSCOUNT`; do
local myMDS=$(facet_host mds$num)
[[ ! '\ '"$MDSNODES"'\ ' = *'\ '"$myMDS"'\ '* ]] && MDSNODES="$MDSNODES $myMDS"
done
echo $MDSNODES
}
osts_nodes () {
local OSTNODES=$(facet_host ost1)
for num in `seq $OSTCOUNT`; do
local myOST=$(facet_host ost$num)
[[ ! '\ '"$OSTNODES"'\ ' = *'\ '"$myOST"'\ '* ]] && OSTNODES="$OSTNODES $myOST"
done
echo $OSTNODES
}
nodes_list () {
# FIXME. We need a list of clients
local myNODES=`hostname`
local OSTNODES=$(osts_nodes)
local myOSTNODES=`echo ' '"$OSTNODES"' ' | sed -e s/[\ ]$(hostname)[\ ]/\ /`
[ -n "$myOSTNODES" ] && myNODES="$myNODES $myOSTNODES"
local myNODES=${myNODES% }
# Add to list only not listed mds nodes
local MDSNODES=$(mdts_nodes)
for myMDS in $MDSNODES; do
[[ ! "'\ '$myNODES'\ '" = *'\ '"$myMDS"'\ '* ]] && myNODES="$myNODES $myMDS"
done
echo $myNODES
}
is_patchless ()
{
grep -q patchless $LPROC/version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment