LU-3665 tests: Cleanup echo client after obdfilter-survey

[fs/lustre-release.git] / lustre-iokit / obdfilter-survey / obdfilter-survey

diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index d75ac47..382db0c 100755 (executable)
--- a/lustre-iokit/obdfilter-survey/obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/obdfilter-survey
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 ######################################################################
 # customize per survey
 
@@ -434,7 +433,7 @@ if [ $case == "network" ]; then
                exit 1
        fi
        # Now start client setup
-       osc_names_str=$($lctl dl| grep osc | grep -v mdt | grep UP)
+       osc_names_str=$($lctl dl| grep osc | grep -v mdt | grep UP || true)
        if [ -n "$osc_names_str" ]; then
                echo "The existing setup must be cleaned";
                exit 0;
@@ -471,7 +470,7 @@ for ((i=0; i < $ndevs; i++)); do
        host=${host_names[$i]}
        devno=($(get_ec_devno $host "${client_names[$i]}" "${ost_names[$i]}"))
        if ((${#devno[@]} != 3)); then
-               exit 1
+               cleanup 2
        fi
        devnos[$i]=${devno[0]}
        client_names[$i]=${devno[1]}
@@ -529,7 +528,7 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
                                rm $tmpf
                                if [ $first_obj = "ERROR" ]; then
                                        print_summary "created object #s on $client_name not contiguous"
-                                       exit 1
+                                       cleanup 3
                                fi
                                first_objs[$idx]=$first_obj
                        done # $ndevs
@@ -539,7 +538,7 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
                                declare -a pidarray
                                for host in ${unique_hosts[@]}; do
                                        remote_shell $host \
-                                           "lctl set_param -n osd*.*OST*.force_sync 1"
+                                           "lctl set_param -n osd*.*.force_sync 1 &>/dev/null || true"
                                        echo "starting run for test: $test rsz: $rsz " \
                                        "threads: $thr objects: $nobj" >> ${vmstatf}_${host}
                                done