X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Frecovery-double-scale.sh;h=2f4b81d15e5bbfdb277c9e7848ce3829ebd3c65b;hp=92ebdffe883fd2f4b8046383836f81c72e28acdd;hb=7a814e94e065551ab79e2ba75df9626e4940efc5;hpb=5d37670e8507563db556879041c7992936aefa56 diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh index 92ebdff..2f4b81d 100644 --- a/lustre/tests/recovery-double-scale.sh +++ b/lustre/tests/recovery-double-scale.sh @@ -193,13 +193,11 @@ Status: $result: rc=$rc" # stop the client loads stop_client_loads $NODES_TO_USE $LOAD_PID_FILE - if [ $rc -ne 0 ]; then - # we are interested in only on failed clients and servers - local failedclients=$(cat $END_RUN_FILE | grep -v $0) - # FIXME: need ostfailover-s nodes also for FLAVOR=OST - gather_logs $(comma_list $(osts_nodes) $(mdts_nodes) \ - $mdsfailover_HOST $failedclients) - fi + if [ $rc -ne 0 ]; then + # we are interested in only on failed clients and servers + local failedclients=$(cat $END_RUN_FILE | grep -v $0) + gather_logs $(comma_list $(all_server_nodes) $failedclients) + fi exit $rc } @@ -307,6 +305,6 @@ run_test pairwise_fail "pairwise combination of clients, MDS, and OST failures" zconf_mount $HOSTNAME $MOUNT || error "mount $MOUNT on $HOSTNAME failed" client_up || error "start client on $HOSTNAME failed" -complete $(basename $0) $SECONDS +complete $SECONDS check_and_cleanup_lustre exit_status