From 2bcb82cd77f5cb616ede36a3fabf351222f069b7 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Tue, 9 Mar 2010 11:26:11 -0800 Subject: [PATCH] b=22169 t-f cleanup: new do_nodev (), do_nodesv () functions i=Robert.Read --- lustre/tests/metadata-updates.sh | 6 +++--- lustre/tests/recovery-double-scale.sh | 6 +----- lustre/tests/recovery-mds-scale.sh | 6 +----- lustre/tests/recovery-random-scale.sh | 6 +----- lustre/tests/replay-single.sh | 2 +- lustre/tests/test-framework.sh | 20 ++++++++++++++------ 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/lustre/tests/metadata-updates.sh b/lustre/tests/metadata-updates.sh index c2c6457..872a995 100755 --- a/lustre/tests/metadata-updates.sh +++ b/lustre/tests/metadata-updates.sh @@ -75,7 +75,7 @@ do_check_data () { echo "Checking file(s) data ... md5sum : " echo "$sums" - do_nodes --verbose $NODES_TO_USE "echo \\\"$sums\\\" | md5sum --check $sum" || \ + do_nodesv $NODES_TO_USE "echo \\\"$sums\\\" | md5sum --check $sum" || \ return ${PIPESTATUS[0]} return 0 } @@ -97,7 +97,7 @@ get_stat () { echo "Checking file(s) attributes ... " - do_nodes --verbose $NODES_TO_USE "set $TRACE; + do_nodesv $NODES_TO_USE "set $TRACE; for HOST in ${NODES_TO_USE//,/ } ; do TESTFILE=$TESTDIR/\\\$HOST/$FILE; tmp=\\\$(stat -c \\\"%u %g %s 0%a\\\" \\\$TESTFILE); @@ -140,7 +140,7 @@ do_check_timestamps () { echo "Checking atime, mtime ... " - do_nodes --verbose $NODES_TO_USE "set $TRACE; + do_nodesv $NODES_TO_USE "set $TRACE; for HOST in ${NODES_TO_USE//,/ } ; do TESTFILE=$TESTDIR/\\\$HOST/$FILE; tmp=\\\$(stat -c \\\"%X %Y\\\" \\\$TESTFILE); diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh index 7e26239..73d96f9 100644 --- a/lustre/tests/recovery-double-scale.sh +++ b/lustre/tests/recovery-double-scale.sh @@ -267,12 +267,8 @@ FAILOVER_PERIOD=${FAILOVER_PERIOD:-$((60*5))} # 5 minutes # Start client loads. start_client_loads $NODES_TO_USE echo clients load pids: -if ! do_nodes $NODES_TO_USE "set -x; echo \$(hostname): && cat $TMP/client-load.pid"; then - if [ -e $DEBUGLOG ]; then - exec 2<&- - cat $DEBUGLOG +if ! do_nodesv $NODES_TO_USE "cat $TMP/client-load.pid"; then exit 3 - fi fi # FIXME: Do we want to have an initial sleep period where the clients diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh index 0ab9999..19508b0 100644 --- a/lustre/tests/recovery-mds-scale.sh +++ b/lustre/tests/recovery-mds-scale.sh @@ -182,12 +182,8 @@ fi start_client_loads $NODES_TO_USE echo clients load pids: -if ! do_nodes $NODES_TO_USE "set -x; echo \$(hostname): && cat $LOAD_PID_FILE"; then - if [ -e $DEBUGLOG ]; then - exec 2<&- - cat $DEBUGLOG +if ! do_nodesv $NODES_TO_USE "cat $LOAD_PID_FILE"; then exit 3 - fi fi START_TS=$(date +%s) diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh index f0a7601..6cedb2b 100644 --- a/lustre/tests/recovery-random-scale.sh +++ b/lustre/tests/recovery-random-scale.sh @@ -190,12 +190,8 @@ fi start_client_loads $NODES_TO_USE echo clients load pids: -if ! do_nodes $NODES_TO_USE "set -x; echo \$(hostname): && cat $LOAD_PID_FILE"; then - if [ -e $DEBUGLOG ]; then - exec 2<&- - cat $DEBUGLOG +if ! do_nodesv $NODES_TO_USE "cat $LOAD_PID_FILE"; then exit 3 - fi fi START_TS=$(date +%s) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index cd68de4..d939e29 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -1843,7 +1843,7 @@ test_70b () { [ "$SLOW" = "no" ] && duration=60 local cmd="rundbench 1 -t $duration" local PID="" - do_nodes --verbose $clients "set -x; MISSING_DBENCH_OK=$MISSING_DBENCH_OK \ + do_nodesv $clients "set -x; MISSING_DBENCH_OK=$MISSING_DBENCH_OK \ PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB \ DBENCH_LIB=$DBENCH_LIB TESTSUITE=$TESTSUITE TESTNAME=$TESTNAME \ LCTL=$LCTL $cmd" & diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 36d6bb1..73f98fa 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -404,7 +404,7 @@ check_gss_daemon_nodes() { local list=$1 dname=$2 - do_nodes --verbose $list "num=\\\$(ps -o cmd -C $dname | grep $dname | wc -l); + do_nodesv $list "num=\\\$(ps -o cmd -C $dname | grep $dname | wc -l); if [ \\\"\\\$num\\\" -ne 1 ]; then echo \\\$num instance of $dname; exit 1; @@ -1535,6 +1535,10 @@ do_node() { return ${PIPESTATUS[0]} } +do_nodev() { + do_node --verbose "$@" +} + single_local_node () { [ "$1" = "$HOSTNAME" ] } @@ -1563,7 +1567,7 @@ do_nodes() { if single_local_node $rnodes; then if $verbose; then - do_node --verbose $rnodes "$@" + do_nodev $rnodes "$@" else do_node $rnodes "$@" fi @@ -1597,6 +1601,10 @@ do_facet() { do_node $HOST "$@" } +do_nodesv() { + do_nodes --verbose "$@" +} + add() { local facet=$1 shift @@ -3001,7 +3009,7 @@ setstripe_nfsserver () { [ -z $nfsserver ] && echo "$dir is not nfs mounted" && return 1 - do_node --verbose $nfsserver lfs setstripe "$@" + do_nodev $nfsserver lfs setstripe "$@" } check_runas_id_ret() { @@ -3153,7 +3161,7 @@ calc_osc_kbytes () { # generate a stream of formatted strings ( =) save_lustre_params() { local s - do_nodes --verbose $1 "lctl get_param $2 | while read s; do echo \\\$s; done" + do_nodesv $1 "lctl get_param $2 | while read s; do echo \\\$s; done" } # restore lustre parameters from input stream, produces by save_lustre_params @@ -3367,7 +3375,7 @@ do_rpc_nodes () { # Add paths to lustre tests for 32 and 64 bit systems. local RPATH="$RLUSTRE/tests:/usr/lib/lustre/tests:/usr/lib64/lustre/tests:$PATH" - do_nodes --verbose $list "PATH=$RPATH sh rpc.sh $@ " + do_nodesv $list "PATH=$RPATH sh rpc.sh $@ " } wait_clients_import_state () { @@ -3528,7 +3536,7 @@ gather_logs () { return fi - do_nodes --verbose $list \ + do_nodesv $list \ "$LCTL dk > ${prefix}.debug_log.\\\$(hostname).${suffix}; dmesg > ${prefix}.dmesg.\\\$(hostname).${suffix}" if [ ! -f $LOGDIR/shared ]; then -- 1.8.3.1