X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre-iokit%2Fobdfilter-survey%2Fobdfilter-survey;h=382db0c3a573ea2c2979fc9053eba62b0f60c7bd;hp=c512ecf86d500a9661c3a177c06f76ea46118bdb;hb=471c7966eb03e6283561ba5690a6f9adab68bb9e;hpb=c1d465de13ccf0eda8020c88661c3cc4d78538ca

diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index c512ecf..382db0c 100755
--- 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
 
@@ -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 &>/dev/null || true"
+					    "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