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-12910 osc: allow increasing osc.*.short_io_bytes
[fs/lustre-release.git]
/
lustre
/
tests
/
runtests
diff --git
a/lustre/tests/runtests
b/lustre/tests/runtests
index
758d7de
..
6e80caf
100755
(executable)
--- a/
lustre/tests/runtests
+++ b/
lustre/tests/runtests
@@
-1,18
+1,10
@@
#!/bin/bash
#
# Script which does some basic tests to ensure we haven't regressed.
#!/bin/bash
#
# Script which does some basic tests to ensure we haven't regressed.
-# Probably a good idea to run this before doing any checkins.
-# In the future this can become more fancy, but it's OK for now.
LUSTRE=${LUSTRE:-$(dirname $0)/..}
LUSTRE=${LUSTRE:-$(dirname $0)/..}
-SRCDIR="$(dirname $0)"
-export PATH=/sbin:/usr/sbin:$SRCDIR:$SRCDIR/../utils:$PATH
-
-export NAME=${NAME:-local}
-
. $LUSTRE/tests/test-framework.sh
init_test_env $@
. $LUSTRE/tests/test-framework.sh
init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
init_logging
RUNTESTS_SRC=${RUNTESTS_SRC:-"/etc /bin"}
init_logging
RUNTESTS_SRC=${RUNTESTS_SRC:-"/etc /bin"}
@@
-23,7
+15,9
@@
RUNTESTS_SRC=${RUNTESTS_SRC:-"/etc /bin"}
[ "$RMDIRMANY" ] || RMDIRMANY="unlinkmany -d"
check_and_setup_lustre
[ "$RMDIRMANY" ] || RMDIRMANY="unlinkmany -d"
check_and_setup_lustre
+
test_1() {
test_1() {
+sleep 5 # let MDS refresh aggregated statfs
# Include some extra space for the status file
USED=$(df -P $DIR | awk '{ print $3 }' | tail -n 1)
# Include some extra space for the status file
USED=$(df -P $DIR | awk '{ print $3 }' | tail -n 1)
@@
-125,8
+119,9
@@
$RMDIRMANY $DST/d 100 || error "$RMDIRMANY cleanup failed"
log "done"
wait_delete_completed
log "done"
wait_delete_completed
+sleep 5 # let MDS refresh aggregated statfs
NOWUSED=$(($(df -P $DIR | awk '{ print $3 }' | tail -n 1)))
NOWUSED=$(($(df -P $DIR | awk '{ print $3 }' | tail -n 1)))
-if [ $(expr $NOWUSED - $USED) -gt
1024
]; then
+if [ $(expr $NOWUSED - $USED) -gt
$(fs_log_size)
]; then
error "Space not all freed: now ${NOWUSED}kB, was ${USED}kB."
else
log "Space was freed: now ${NOWUSED}kB, was ${USED}kB."
error "Space not all freed: now ${NOWUSED}kB, was ${USED}kB."
else
log "Space was freed: now ${NOWUSED}kB, was ${USED}kB."