Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6317 lfsck: NOT count the objects repeatedly
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-lfsck.sh
diff --git
a/lustre/tests/sanity-lfsck.sh
b/lustre/tests/sanity-lfsck.sh
index
e82c72f
..
ea21409
100644
(file)
--- a/
lustre/tests/sanity-lfsck.sh
+++ b/
lustre/tests/sanity-lfsck.sh
@@
-936,18
+936,21
@@
test_9a() {
return 0
fi
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
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
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'"
[ "$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.
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
$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)) / \
# 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 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)"
error "(7) Failed to get expected 'completed'"
}
run_test 9a "LFSCK speed control (1)"