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-16138 kernel: preserve RHEL8.x server kABI for block integrity
[fs/lustre-release.git]
/
lustre
/
tests
/
lfsck-performance.sh
diff --git
a/lustre/tests/lfsck-performance.sh
b/lustre/tests/lfsck-performance.sh
index
dc873bf
..
dbbf3fe
100644
(file)
--- a/
lustre/tests/lfsck-performance.sh
+++ b/
lustre/tests/lfsck-performance.sh
@@
-3,21
+3,20
@@
set -e
ONLY=${ONLY:-"$*"}
set -e
ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT="$LFSCK_PERFORMANCE_EXCEPT"
-[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-LUSTRE=${LUSTRE:-$(
cd $(dirname $0)/..; echo $PWD)
}
+LUSTRE=${LUSTRE:-$(
dirname $0)/..
}
. $LUSTRE/tests/test-framework.sh
init_test_env $@
. $LUSTRE/tests/test-framework.sh
init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
init_logging
init_logging
+ALWAYS_EXCEPT="$LFSCK_PERFORMANCE_EXCEPT"
+build_test_filter
+
require_dsh_mds || exit 0
require_dsh_ost || exit 0
[ "$SLOW" = "no" ] &&
require_dsh_mds || exit 0
require_dsh_ost || exit 0
[ "$SLOW" = "no" ] &&
- skip "skip lfsck performance test under non-SLOW mode"
&& exit 0
+ skip "skip lfsck performance test under non-SLOW mode"
NTHREADS=${NTHREADS:-0}
UNIT=${UNIT:-8192}
NTHREADS=${NTHREADS:-0}
UNIT=${UNIT:-8192}
@@
-59,9
+58,8
@@
lfsck_attach() {
lfsck_detach() {
${ECHOCMD} "${LCTL} <<-EOF
lfsck_detach() {
${ECHOCMD} "${LCTL} <<-EOF
- device lfsck-MDT0000
- cleanup
- detach
+ --device lfsck-MDT0000 cleanup
+ --device lfsck-MDT0000 detach
EOF"
}
EOF"
}
@@
-69,23
+67,15
@@
lfsck_create() {
local echodev=$(${RLCTL} dl | grep echo_client|awk '{print $1}')
local j
local echodev=$(${RLCTL} dl | grep echo_client|awk '{print $1}')
local j
- ${ECHOCMD} "${LCTL} <<-EOF
- cfg_device ${echodev}
- test_mkdir ${tdir}
- EOF"
+ ${ECHOCMD} "${LCTL} --device ${echodev} test_mkdir ${tdir}"
for ((j = 1; j < ${threads}; j++)); do
for ((j = 1; j < ${threads}; j++)); do
- ${ECHOCMD} "${LCTL} <<-EOF
- cfg_device ${echodev}
- test_mkdir ${tdir}${j}
- EOF"
+ ${ECHOCMD} "${LCTL} --device ${echodev} test_mkdir ${tdir}${j}"
done
done
- ${ECHOCMD} "${LCTL} <<-EOF
- cfg_device ${echodev}
- --threads ${threads} 0 ${echodev} test_create \
- -d ${tdir} -D ${threads} -b ${lbase} -c 0 -n ${usize}
- EOF"
+ ${ECHOCMD} "${LCTL} --device ${echodev} \
+ --threads ${threads} 0 ${echodev} \
+ test_create -d${tdir} -D${threads} -b${lbase} -c0 -n${usize}"
}
lfsck_cleanup() {
}
lfsck_cleanup() {
@@
-129,8
+119,6
@@
lfsck_create_nfiles() {
done
}
done
}
-build_test_filter
-
format_start_mgs () {
do_rpc_nodes $(facet_active_host mgs) load_modules_local
format_mgs
format_start_mgs () {
do_rpc_nodes $(facet_active_host mgs) load_modules_local
format_mgs
@@
-179,8
+167,8
@@
test_0() {
run_test 0 "lfsck namespace performance (routine case) without load"
test_1() {
run_test 0 "lfsck namespace performance (routine case) without load"
test_1() {
- [
$(facet_fstype $SINGLEMDS)
!= ldiskfs ] &&
- skip
"not implemented for ZFS" && return
+ [
"$mds1_FSTYPE"
!= ldiskfs ] &&
+ skip
_env "not implemented for ZFS"
local BCOUNT=0
local i
local BCOUNT=0
local i
@@
-932,7
+920,7
@@
test_7c() {
run_test 7c "namespace LFSCK performance (repairing bad FID-in-dirent) for DNE"
test_8() {
run_test 7c "namespace LFSCK performance (repairing bad FID-in-dirent) for DNE"
test_8() {
- [ $MDSCOUNT -lt 2 ] && skip
"needs >= 2 MDTs" && return
+ [ $MDSCOUNT -lt 2 ] && skip
_env "needs >= 2 MDTs"
[ $INCFACTOR -gt 25 ] && INCFACTOR=25
[ $INCFACTOR -gt 25 ] && INCFACTOR=25