X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-lfsck.sh;h=ea2140957673f0ab4d0fe53bec600a0170dd59b4;hp=e82c72ff613fd664d99a6276cada2413e33f392b;hb=e9a6c24504b4aae13d9c0f1caf9c6827f0a6a138;hpb=d381825c0e77fd342e5d1cf136135ec3f35ff22a

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index e82c72f..ea21409 100644
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -936,18 +936,21 @@ test_9a() {
 		return 0
 	fi
 
-	lfsck_prep 70 70
+	check_mount_and_prep
+	$LFS mkdir -i 0 $DIR/$tdir/lfsck || error "(1) Fail to mkdir lfsck"
+	$LFS setstripe -c 1 -i -1 $DIR/$tdir/lfsck
+	createmany -o $DIR/$tdir/lfsck/f 5000
 
 	local BASE_SPEED1=100
 	local RUN_TIME1=10
-	$START_NAMESPACE -r -s $BASE_SPEED1 || error "(3) Fail to start LFSCK!"
+	$START_LAYOUT -r -s $BASE_SPEED1 || error "(2) Fail to start LFSCK!"
 
 	sleep $RUN_TIME1
-	STATUS=$($SHOW_NAMESPACE | awk '/^status/ { print $2 }')
+	STATUS=$($SHOW_LAYOUT | awk '/^status/ { print $2 }')
 	[ "$STATUS" == "scanning-phase1" ] ||
 		error "(3) Expect 'scanning-phase1', but got '$STATUS'"
 
-	local SPEED=$($SHOW_NAMESPACE |
+	local SPEED=$($SHOW_LAYOUT |
 		      awk '/^average_speed_phase1/ { print $2 }')
 
 	# There may be time error, normally it should be less than 2 seconds.
@@ -966,7 +969,7 @@ test_9a() {
 		$LCTL set_param -n mdd.${MDT_DEV}.lfsck_speed_limit $BASE_SPEED2
 	sleep $RUN_TIME2
 
-	SPEED=$($SHOW_NAMESPACE | awk '/^average_speed_phase1/ { print $2 }')
+	SPEED=$($SHOW_LAYOUT | awk '/^average_speed_phase1/ { print $2 }')
 	# MIN_MARGIN = 0.8 = 8 / 10
 	local MIN_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 - TIME_DIFF) + \
 			    BASE_SPEED2 * (RUN_TIME2 - TIME_DIFF)) / \
@@ -992,8 +995,8 @@ test_9a() {
 		$LCTL set_param -n mdd.${MDT_DEV}.lfsck_speed_limit 0
 
 	wait_update_facet $SINGLEMDS \
-	    "$LCTL get_param -n mdd.${MDT_DEV}.lfsck_namespace|\
-	    awk '/^status/ { print \\\$2 }'" "completed" 30 ||
+		"$LCTL get_param -n mdd.${MDT_DEV}.lfsck_layout |
+		awk '/^status/ { print \\\$2 }'" "completed" 30 ||
 		error "(7) Failed to get expected 'completed'"
 }
 run_test 9a "LFSCK speed control (1)"