X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fmds-survey.sh;h=a4085673aec2cfe49f115fd9cbee88c246b7993d;hp=6eb9b45b10659484e57a5f1f53faee9fc6b74f21;hb=530b16b187de9a27723205d9d759f260bfd350b8;hpb=6d57484b718a986aea0ac83802b1b966df576ed8

diff --git a/lustre/tests/mds-survey.sh b/lustre/tests/mds-survey.sh
index 6eb9b45..a408567 100644
--- a/lustre/tests/mds-survey.sh
+++ b/lustre/tests/mds-survey.sh
@@ -67,29 +67,50 @@ cleanup_mount $MOUNT
 cleanup_mount $MOUNT2
 
 get_target() {
-    local mds=$(facet_host $SINGLEMDS)
-    echo $(do_nodes $mds 'lctl dl' | \
-        awk "{if (\$2 == \"UP\" && \$3 == \"mdt\") {print \$4}}")
+	local node=$1
+	local mdt
+	local mdts
+	local target
+
+	mdts=$(do_node $node "$LCTL dl" |
+	       awk "{if (\$2 == \"UP\" && \$3 == \"mdt\") {print \$4}}")
+
+	for mdt in $mdts; do
+		target+="${target:+ }$node:$mdt"
+	done
+
+	echo -n $target
+}
+
+get_targets() {
+	local targets
+	local node
+
+	for node in $(mdts_nodes); do
+		targets+="${targets:+ }$(get_target $node)"
+	done
+
+	echo -n $targets
 }
 
 mds_survey_run() {
-    local layer=${1:-mdd}
-    local stripe_count=${2:-0}
-    local mds=$(facet_host $SINGLEMDS)
-    local rc=0
-
-    rm -f ${TMP}/mds_survey*
-
-    local target=$(get_target)
-    local cmd="file_count=$file_count thrlo=$thrlo thrhi=$thrhi"
-    local cmd+=" dir_count=$dir_count layer=$layer stripe_count=$stripe_count"
-    local cmd+=" rslt_loc=${TMP} targets=\"$mds:$target\" $MDSSURVEY"
-
-    echo + $cmd
-    eval $cmd || rc=$?
-    cat ${TMP}/mds_survey*
-    rm -f ${TMP}/mds_survey*
-    ((rc == 0)) || error "mds-survey failed"
+	local layer=${1:-mdd}
+	local stripe_count=${2:-0}
+	local rc=0
+
+	rm -f ${TMP}/mds_survey*
+
+	local cmd="file_count=$file_count thrlo=$thrlo thrhi=$thrhi"
+	cmd+=" dir_count=$dir_count layer=$layer stripe_count=$stripe_count"
+	cmd+=" rslt_loc=${TMP} targets=\"$(get_targets)\" $MDSSURVEY"
+
+	trap cleanup_echo_devs EXIT ERR
+
+	echo + $cmd
+	eval $cmd || rc=$?
+	cat ${TMP}/mds_survey*
+	rm -f ${TMP}/mds_survey*
+	((rc == 0)) || error "mds-survey failed"
 }
 
 test_1() {