Branch HEAD

fix an error in the test_18b of sanity-quota.sh
b=17832
i=tianzy

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 634ecf1..7cf7cbb 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1477,20 +1477,15 @@ test_18b() {
        test_18bc_sub normal
        test_18bc_sub directio
        # check if watchdog is triggered
-       MSG="test 18b: run for fixing bug14840"
-       do_facet ost1 "dmesg > $TMP/lustre-log-${TESTNAME}.log"
-       do_facet client cat > $TMP/lustre-log-${TESTNAME}.awk <<-EOF
-               /$MSG/ {
-                   start = 1;
-               }
-               /Watchdog triggered/ {
-                   if (start) {
-                       print \$0;
-                   }
-               }
-       EOF
-       watchdog=`do_facet ost1 awk -f $TMP/lustre-log-${TESTNAME}.awk $TMP/lustre-log-${TESTNAME}.log`
+       do_facet ost1 dmesg > $TMP/lustre-log-${TESTNAME}.log
+       watchdog=`awk '/test 18b/ {start = 1;}
+                      /Watchdog triggered/ {
+                              if (start) {
+                                      print;
+                              }
+                      }' $TMP/lustre-log-${TESTNAME}.log`
        if [ -n "$watchdog" ]; then error "$watchdog"; fi
+       rm -f $TMP/lustre-log-${TESTNAME}.log
 }
 run_test_with_stat 18b "run for fixing bug14840(mds failover, no watchdog) ==========="