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-2955 tests: make replay-ost-single/8b SLOW for ZFS
[fs/lustre-release.git]
/
lustre
/
tests
/
mdsrate-stat-large.sh
diff --git
a/lustre/tests/mdsrate-stat-large.sh
b/lustre/tests/mdsrate-stat-large.sh
index
c1f6c6f
..
19c4375
100644
(file)
--- a/
lustre/tests/mdsrate-stat-large.sh
+++ b/
lustre/tests/mdsrate-stat-large.sh
@@
-17,17
+17,14
@@
init_test_env $@
assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
-MACHINEFILE=${MACHINEFILE:-$(basename $0 .sh).machines}
-TESTDIR=$MOUNT
+MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
+# Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
+BASEDIR=$MOUNT/mdsrate
+TESTDIR=$MOUNT/stat
# Requirements
NUM_FILES=${NUM_FILES:-1000000}
TIME_PERIOD=${TIME_PERIOD:-600} # seconds
# Requirements
NUM_FILES=${NUM_FILES:-1000000}
TIME_PERIOD=${TIME_PERIOD:-600} # seconds
-SINGLE_TARGET_RATE=$((3300 / OSTCOUNT)) # ops/sec
-AGGREGATE_TARGET_RATE=$((28500 / OSTCOUNT)) # ops/sec
-
-# --random_order (default) -OR- --readdir_order
-DIR_ORDER=${DIR_ORDER:-"--readdir_order"}
LOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
CLIENT=$SINGLECLIENT
LOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
CLIENT=$SINGLECLIENT
@@
-42,16
+39,24
@@
log "===== $0 ====== "
check_and_setup_lustre
check_and_setup_lustre
-generate_machine_file $NODES_TO_USE $MACHINEFILE
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -c -1
+get_stripe $BASEDIR
+
+IFree=$(mdsrate_inodes_available)
+if [ $IFree -lt $NUM_FILES ]; then
+ NUM_FILES=$IFree
+fi
-$LFS setstripe $TESTDIR -c -1
-get_stripe $TESTDIR
+generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
if [ -n "$NOCREATE" ]; then
echo "NOCREATE=$NOCREATE => no file creation."
else
if [ -n "$NOCREATE" ]; then
echo "NOCREATE=$NOCREATE => no file creation."
else
+ mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d' --ignore
+
log "===== $0 Test preparation: creating ${NUM_FILES} files."
log "===== $0 Test preparation: creating ${NUM_FILES} files."
- echo "Test preparation: creating ${NUM_FILES} files."
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --dir ${TESTDIR}
--nfiles ${NUM_FILES} --filefmt 'f%%d'"
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --dir ${TESTDIR}
--nfiles ${NUM_FILES} --filefmt 'f%%d'"
@@
-63,53
+68,53
@@
else
NUM_THREADS=$NUM_CLIENTS
fi
NUM_THREADS=$NUM_CLIENTS
fi
-
$MPIRUN -np ${NUM_THREADS} -machinefile
${MACHINEFILE} \
-
${MPIRUN_OPTIONS}
${COMMAND} 2>&1
- [ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting"
-
+
mpi_run -np ${NUM_THREADS} ${MACHINEFILE_OPTION}
${MACHINEFILE} \
+
${COMMAND} 2>&1
+ [ ${PIPESTATUS[0]} != 0 ] &&
+ error "mdsrate file creation failed, aborting"
fi
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --stat --time ${TIME_PERIOD}
fi
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --stat --time ${TIME_PERIOD}
- --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'
- ${DIR_ORDER} ${SEED_OPTION}"
+ --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'"
# 1
if [ -n "$NOSINGLE" ]; then
echo "NO Test for stats on a single client."
else
log "===== $0 ### 1 NODE STAT ###"
# 1
if [ -n "$NOSINGLE" ]; then
echo "NO Test for stats on a single client."
else
log "===== $0 ### 1 NODE STAT ###"
- echo "Running stats on 1 node(s)."
echo "+" ${COMMAND}
echo "+" ${COMMAND}
- $MPIRUN -np 1 -machinefile ${MACHINEFILE} ${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
+ mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
+ tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then
if [ ${PIPESTATUS[0]} != 0 ]; then
- [ -f $LOG ] &&
cat
$LOG
- error "m
pirun ... mdsrate ...
failed, aborting"
+ [ -f $LOG ] &&
sed -e "s/^/log: /"
$LOG
+ error "m
dsrate stats on a single client
failed, aborting"
fi
fi
- check_rate stat ${SINGLE_TARGET_RATE} 1 ${LOG} || true
fi
# 2
fi
# 2
+[ $NUM_CLIENTS -eq 1 ] && NOMULTI=yes
if [ -n "$NOMULTI" ]; then
echo "NO test for stats on multiple nodes."
else
log "===== $0 ### ${NUM_CLIENTS} NODES STAT ###"
if [ -n "$NOMULTI" ]; then
echo "NO test for stats on multiple nodes."
else
log "===== $0 ### ${NUM_CLIENTS} NODES STAT ###"
- echo "Running stats on ${NUM_CLIENTS} node(s)."
echo "+" ${COMMAND}
echo "+" ${COMMAND}
- NUM_THREADS=$(get_node_count ${NODES_TO_USE//,/ })
-
$MPIRUN -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${MPIRUN_OPTIONS}
${COMMAND} | tee ${LOG}
+ mpi_run -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+
${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then
if [ ${PIPESTATUS[0]} != 0 ]; then
- [ -f $LOG ] &&
cat
$LOG
- error "m
pirun ... mdsrate ...
failed, aborting"
+ [ -f $LOG ] &&
sed -e "s/^/log: /"
$LOG
+ error "m
dsrate stats on multiple nodes
failed, aborting"
fi
fi
- check_rate stat ${AGGREGATE_TARGET_RATE} ${NUM_CLIENTS} ${LOG} || true
fi
fi
-equals_msg `basename $0`: test complete, cleaning up
-zconf_umount_clients $NODES_TO_USE $MOUNT
+
+complete $SECONDS
+mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d'
+rmdir $BASEDIR || true
+rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
check_and_cleanup_lustre
#rm -f $LOG