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-16097 tests: skip quota subtests in interop
[fs/lustre-release.git]
/
lustre
/
tests
/
scrub-performance.sh
diff --git
a/lustre/tests/scrub-performance.sh
b/lustre/tests/scrub-performance.sh
index
a75daa7
..
7512f38
100644
(file)
--- a/
lustre/tests/scrub-performance.sh
+++ b/
lustre/tests/scrub-performance.sh
@@
-3,16
+3,15
@@
set -e
ONLY=${ONLY:-"$*"}
set -e
ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT="$SCRUB_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
. $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_test_env "$@"
init_logging
init_logging
+ALWAYS_EXCEPT="$SCRUB_PERFORMANCE_EXCEPT"
+build_test_filter
+
[ "$SLOW" = "no" ] &&
skip "skip scrub performance test under non-SLOW mode" && exit 0
[ "$SLOW" = "no" ] &&
skip "skip scrub performance test under non-SLOW mode" && exit 0
@@
-67,9
+66,8
@@
scrub_attach() {
scrub_detach() {
${ECHOCMD} "${LCTL} <<-EOF
scrub_detach() {
${ECHOCMD} "${LCTL} <<-EOF
- device scrub-MDT0000
- cleanup
- detach
+ --device scrub-MDT0000 cleanup
+ --device scrub-MDT0000 detach
EOF"
}
EOF"
}
@@
-77,23
+75,15
@@
scrub_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
- ${ECHOCMD} "${LCTL} <<-EOF
- cfg_device ${echodev}
- test_mkdir ${tdir}${j}
- EOF"
+ for ((j = 1; j < ${threads}; j++)); do
+ ${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}"
}
scrub_cleanup() {
}
scrub_cleanup() {
@@
-135,8
+125,6
@@
scrub_create_nfiles() {
done
}
done
}
-build_test_filter
-
test_0() {
local BASECOUNT=0
local i
test_0() {
local BASECOUNT=0
local i
@@
-195,6
+183,6
@@
run_test 0 "OI scrub performance test"
# cleanup the system at last
scrub_cleanup
# cleanup the system at last
scrub_cleanup
-complete $SECONDS
+complete
_test
$SECONDS
check_and_cleanup_lustre
exit_status
check_and_cleanup_lustre
exit_status