From 383acceb3a045098ea4b93ed07633f701b04f4fe Mon Sep 17 00:00:00 2001 From: Chris Gearing Date: Tue, 4 Oct 2011 18:31:59 +0100 Subject: [PATCH] LU-233 test: Remove taring of log files in gather logs. gather_logs in test-framework zips the logs for no apparent purpose just adding to the file storage. In fact it creates multiple bz2 files which contain one another. This change removes all the bz2 stuff Change made to remove Russian dolls whilst keeping behaviour of recovery-*-scale tests Signed-off-by: Chris Gearing Change-Id: I76a15a44395c0bdf4ee01e9240b64bdcdf8b25ed Reviewed-on: http://review.whamcloud.com/1398 Tested-by: Hudson Reviewed-by: Brian J. Murrell Tested-by: Maloo Reviewed-by: Yu Jian Reviewed-by: Oleg Drokin --- lustre/tests/recovery-double-scale.sh | 2 +- lustre/tests/recovery-mds-scale.sh | 2 +- lustre/tests/recovery-random-scale.sh | 2 +- lustre/tests/test-framework.sh | 11 +++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh index 72b6d3c..5c18183 100644 --- a/lustre/tests/recovery-double-scale.sh +++ b/lustre/tests/recovery-double-scale.sh @@ -245,7 +245,7 @@ Status: $result: rc=$rc" local failedclients=$(cat $END_RUN_FILE | grep -v $0) # FIXME: need ostfailover-s nodes also for FLAVOR=OST local product=$(gather_logs $(comma_list $(osts_nodes) \ - $(mdts_nodes) $mdsfailover_HOST $failedclients)) + $(mdts_nodes) $mdsfailover_HOST $failedclients) 1) echo logs files $product fi diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh index 3ebe05b..02ec4ce 100644 --- a/lustre/tests/recovery-mds-scale.sh +++ b/lustre/tests/recovery-mds-scale.sh @@ -163,7 +163,7 @@ Status: $result: rc=$rc" local failedclients=$(cat $END_RUN_FILE | grep -v $0) # FIXME: need ostfailover-s nodes also for FLAVOR=OST local product=$(gather_logs $(comma_list $(osts_nodes) \ - $(mdts_nodes) $mdsfailover_HOST $failedclients)) + $(mdts_nodes) $mdsfailover_HOST $failedclients) 1) echo logs files $product fi diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh index b977b9c..3d995f2 100644 --- a/lustre/tests/recovery-random-scale.sh +++ b/lustre/tests/recovery-random-scale.sh @@ -170,7 +170,7 @@ Status: $result: rc=$rc" local failedclients=$(cat $END_RUN_FILE | grep -v $0) # FIXME: need ostfailover-s nodes also for FLAVOR=OST local product=$(gather_logs $(comma_list $(osts_nodes) \ - $(mdts_nodes) $mdsfailover_HOST $failedclients)) + $(mdts_nodes) $mdsfailover_HOST $failedclients) 1) echo logs files $product fi diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 15fe46a..3445cd8 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -3057,7 +3057,7 @@ error_noexit() { # We need to dump the logs on all nodes if $dump; then - gather_logs $(comma_list $(nodes_list)) + gather_logs $(comma_list $(nodes_list)) 0 fi debugrestore @@ -4231,6 +4231,7 @@ cleanup_pools () { gather_logs () { local list=$1 + local tar_logs=$2 local ts=$(date +%s) local docp=true @@ -4256,10 +4257,12 @@ gather_logs () { do_nodes $list rsync -az "${prefix}.*.${suffix}" $HOSTNAME:$LOGDIR fi - local archive=$LOGDIR/${TESTSUITE}-$ts.tar.bz2 - tar -jcf $archive $LOGDIR/*$ts* $LOGDIR/*${TESTSUITE}* + if [ $tar_logs == 1 ]; then + local archive=$LOGDIR/${TESTSUITE}-$ts.tar.bz2 + tar -jcf $archive $LOGDIR/*$ts* $LOGDIR/*${TESTSUITE}* - echo $archive + echo $archive + fi } cleanup_logs () { -- 1.8.3.1