LU-14475 log: Rewrite some log messages

[fs/lustre-release.git] / lustre / tests / sgpdd-survey.sh

diff --git a/lustre/tests/sgpdd-survey.sh b/lustre/tests/sgpdd-survey.sh
index de84b44..b2c1e23 100644 (file)
--- a/lustre/tests/sgpdd-survey.sh
+++ b/lustre/tests/sgpdd-survey.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
-#set -x
+
 set -e
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+ALWAYS_EXCEPT="$SGPDD_SURVEY_EXCEPT"
+build_test_filter
+
 # QE uses the following parameters:
 # size=128 crghi=16 thrhi=32
 crghi=${crghi:-2}
@@ -16,18 +18,11 @@ size=${size:-1024}
 
 [ "$SLOW" = no ] && { crghi=2; thrhi=2; }
 
-if ! ([ "$SGPDD_YES" ] && [ "$REFORMAT" ]); then
-    skip_env "$0 reformats all devices, please set SGPDD_YES and REFORMAT to run this test"
-    exit 0
+if [ "$SGPDD_YES" != "yes" -o "$REFORMAT" != "yes" ]; then
+       skip_env "$0 reformats all devices, set SGPDD_YES=yes REFORMAT=yes"
+       exit 0
 fi
 
-# Skip these tests
-ALWAYS_EXCEPT="$SGPDD_SURVEY_EXCEPT"
-
-SGPDDSURVEY=${SGPDDSURVEY:-$(which sgpdd-survey)}
-
-build_test_filter
-
 init_facets_vars
 
 cleanupall
@@ -48,13 +43,13 @@ run_sgpdd_facets () {
     for facet in ${facets//,/ }; do
         local host=$(facet_host $facet)
         local dev=${facet}_dev
-        local var=${host}_devs
+        local var=$(node_var_name ${host}_devs)
         eval ${var}=$(expand_list ${!var} ${!dev})
         facetshosts=$(expand_list $facetshosts $host)
     done
 
     for host in ${facetshosts//,/ }; do
-        var=${host}_devs
+        var=$(node_var_name ${host}_devs)
         echo "=== $facets === $host === ${!var} ==="
         local scsidevs=${!var}
         run_sgpdd_host $host ${scsidevs}
@@ -62,18 +57,24 @@ run_sgpdd_facets () {
 }
 
 test_1 () {
-    local mdss=$(get_facets MDS)
+       local mdss=$(get_facets MDS)
 
-    run_sgpdd_facets $mdss
+       check_progs_installed $(facets_hosts $mdss) $SGPDDSURVEY sg_map ||
+               skip_env "SGPDDSURVEY=$SGPDDSURVEY or sg_map not found"
+
+       run_sgpdd_facets $mdss
 }
 run_test 1 "sgpdd-survey, mds, scsidevs"
 
 test_2 () {
-    local osts=$(get_facets OST)
+       local osts=$(get_facets OST)
+
+       check_progs_installed $(facets_hosts $osts) $SGPDDSURVEY sg_map ||
+               skip_env "SGPDDSURVEY=$SGPDDSURVEY or sg_map not found"
 
-    run_sgpdd_facets $osts
+       run_sgpdd_facets $osts
 }
 run_test 2 "sgpdd-survey, osts, scsidevs"
 
-equals_msg `basename $0`: test complete, cleaning up
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+complete $SECONDS
+exit_status