X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frecovery-double-scale.sh;h=2f4b81d15e5bbfdb277c9e7848ce3829ebd3c65b;hb=b046468f58a1f40e85cb59ed9abf75fd2fd5ea5a;hp=18ca852a35fcfd3e69f2c45d014447a00b383e22;hpb=fb05f2d177fbcfc2499008a4bb04fdf64ab19466;p=fs%2Flustre-release.git

diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh
index 18ca852..2f4b81d 100644
--- a/lustre/tests/recovery-double-scale.sh
+++ b/lustre/tests/recovery-double-scale.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 
 # All pairwise combinations of node failures.
 # Was cmd3-17
@@ -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