speed up mdsrate test.
b=20501
r=rread
r=grev
assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
-TESTDIR=$MOUNT
+BASEDIR=$MOUNT/mdsrate
# Requirements
# set NUM_FILES=0 to force TIME_PERIOD work
TIME_PERIOD=${TIME_PERIOD:-600} # seconds
# Local test variables
-TESTDIR_SINGLE="${TESTDIR}/single"
-TESTDIR_MULTI="${TESTDIR}/multi"
+TESTDIR_SINGLE="${BASEDIR}/single"
+TESTDIR_MULTI="${BASEDIR}/multi"
LOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
CLIENT=$SINGLECLIENT
check_and_setup_lustre
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -c -1
+get_stripe $BASEDIR
+
IFree=$(inodes_available)
if [ $IFree -lt $NUM_FILES ]; then
NUM_FILES=$IFree
generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
-$LFS setstripe $TESTDIR -c -1
-get_stripe $TESTDIR
-
# Make sure we start with a clean slate
rm -f ${LOG}
[ -f $LOG ] && sed -e "s/^/log: /" $LOG
error "mdsrate unlink on a single client failed, aborting"
fi
+
+ rmdir $TESTDIR_SINGLE
fi
IFree=$(inodes_available)
[ -f $LOG ] && sed -e "s/^/log: /" $LOG
error "mdsrate unlink on multiple nodes failed, aborting"
fi
+
+ rmdir $TESTDIR_MULTI
fi
+rmdir $BASEDIR || true
rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
-TESTDIR=$MOUNT
+BASEDIR=$MOUNT/mdsrate
# Requirements
NUM_FILES=${NUM_FILES:-1000000}
TIME_PERIOD=${TIME_PERIOD:-600} # seconds
# Local test variables
-TESTDIR_SINGLE="${TESTDIR}/single"
-TESTDIR_MULTI="${TESTDIR}/multi"
+TESTDIR_SINGLE="${BASEDIR}/single"
+TESTDIR_MULTI="${BASEDIR}/multi"
LOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
CLIENT=$SINGLECLIENT
check_and_setup_lustre
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -i 0 -c 1
+get_stripe $BASEDIR
+
IFree=$(inodes_available)
if [ $IFree -lt $NUM_FILES ]; then
NUM_FILES=$IFree
generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
-$LFS setstripe $TESTDIR -i 0 -c 1
-get_stripe $TESTDIR
-
if [ -n "$NOSINGLE" ]; then
echo "NO Tests on single client."
else
[ -f $LOG ] && sed -e "s/^/log: /" $LOG
error "mdsrate unlinks for a single client failed, aborting"
fi
+
+ rmdir $TESTDIR_SINGLE
fi
fi
[ -f $LOG ] && sed -e "s/^/log: /" $LOG
error "mdsrate unlinks multiple nodes failed, aborting"
fi
+
+ rmdir $TESTDIR_MULTI
fi
fi
equals_msg `basename $0`: test complete, cleaning up
+rmdir $BASEDIR || true
rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
# Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
-TESTDIR=$MOUNT/mdsrate
+BASEDIR=$MOUNT/mdsrate
# Requirements
NUM_DIRS=${NUM_DIRS:-10}
log "===== $0 ====== "
check_and_setup_lustre
-mkdir -p $TESTDIR
-chmod 0777 $TESTDIR
+
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -c 1
+get_stripe $BASEDIR
IFree=$(inodes_available)
if [ $IFree -lt $((NUM_FILES * NUM_DIRS)) ]; then
generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
-$LFS setstripe $TESTDIR -c 1
-get_stripe $TESTDIR
-
-DIRfmt="${TESTDIR}/t6-%d"
+DIRfmt="${BASEDIR}/lookup-%d"
if [ -n "$NOCREATE" ]; then
echo "NOCREATE=$NOCREATE => no file creation."
else
# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
for i in $(seq 0 $NUM_DIRS); do
- mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR/t6-$i 'f%%d' --ignore
+ mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $BASEDIR/lookup-$i 'f%%d' --ignore
done
log "===== $0 Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files."
equals_msg `basename $0`: test complete, cleaning up
# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
for i in $(seq 0 $NUM_DIRS); do
- mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR/t6-$i 'f%%d' --ignore
- rmdir $TESTDIR/t6-$i
+ mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $BASEDIR/lookup-$i 'f%%d' --ignore
done
-rmdir $TESTDIR || true
+rmdir $BASEDIR || true
rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
# Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
-TESTDIR=$MOUNT/mdsrate
+BASEDIR=$MOUNT/mdsrate
+TESTDIR=$BASEDIR/lookup
# Requirements
NUM_FILES=${NUM_FILES:-1000000}
log "===== $0 ====== "
check_and_setup_lustre
-mkdir -p $TESTDIR
-chmod 0777 $TESTDIR
+
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -c 1
+get_stripe $BASEDIR
IFree=$(inodes_available)
if [ $IFree -lt $NUM_FILES ]; then
generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
-$LFS setstripe $TESTDIR -c 1
-get_stripe $TESTDIR
-
if [ -n "$NOCREATE" ]; then
echo "NOCREATE=$NOCREATE => no file creation."
else
equals_msg `basename $0`: test complete, cleaning up
mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d'
+rmdir $BASEDIR || true
rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
# Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
-TESTDIR=$MOUNT/mdsrate
+BASEDIR=$MOUNT/mdsrate
+TESTDIR=$MOUNT/stat
# Requirements
NUM_FILES=${NUM_FILES:-1000000}
log "===== $0 ====== "
check_and_setup_lustre
-mkdir -p $TESTDIR
-chmod 0777 $TESTDIR
+
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -c -1
+get_stripe $BASEDIR
IFree=$(inodes_available)
if [ $IFree -lt $NUM_FILES ]; then
generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
-$LFS setstripe $TESTDIR -c -1
-get_stripe $TESTDIR
-
if [ -n "$NOCREATE" ]; then
echo "NOCREATE=$NOCREATE => no file creation."
else
equals_msg `basename $0`: test complete, cleaning up
mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d'
+rmdir $BASEDIR || true
rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
# Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
-TESTDIR=$MOUNT/mdsrate
+BASEDIR=$MOUNT/mdsrate
+TESTDIR=$BASEDIR/stat
# Requirements
NUM_FILES=${NUM_FILES:-1000000}
log "===== $0 ====== "
check_and_setup_lustre
-mkdir -p $TESTDIR
-chmod 0777 $TESTDIR
+
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -i 0 -c 1
+get_stripe $BASEDIR
IFree=$(inodes_available)
if [ $IFree -lt $NUM_FILES ]; then
generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
-$LFS setstripe $TESTDIR -i 0 -c 1
-get_stripe $TESTDIR
-
if [ -n "$NOCREATE" ]; then
echo "NOCREATE=$NOCREATE => no file creation."
else
equals_msg `basename $0`: test complete, cleaning up
mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d'
+rmdir $BASEDIR || true
rm -f $MACHINEFILE
check_and_cleanup_lustre
#rm -f $LOG
}
mdsrate_cleanup () {
- mpi_run -np $1 -machinefile $2 ${MDSRATE} --unlink --nfiles $3 --dir $4 --filefmt $5 $6
+ if [ -d $4 ]; then
+ mpi_run -np $1 -machinefile $2 ${MDSRATE} --unlink --nfiles $3 --dir $4 --filefmt $5 $6
+ rmdir $4
+ fi
}
delayed_recovery_enabled () {