Remove the duplicate variables from parallel-scale.sh and
parallel-scale-nfs.sh. Those variables are defined inside
the corresponding functions in functions.sh.
Signed-off-by: Yu Jian <yujian@whamcloud.com>
Change-Id: I77ea061289296aeb8b138631f7a55090f52093c9
Reviewed-on: http://review.whamcloud.com/2306
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Cliff White <cliffw@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
- WRITE_DISJOINT=${WRITE_DISJOINT:-\
- $(which write_disjoint 2> /dev/null || true)}
+ WRITE_DISJOINT=${WRITE_DISJOINT:-$(which write_disjoint \
+ 2> /dev/null || true)}
# threads per client
wdisjoint_THREADS=${wdisjoint_THREADS:-4}
wdisjoint_REP=${wdisjoint_REP:-10000}
# threads per client
wdisjoint_THREADS=${wdisjoint_THREADS:-4}
wdisjoint_REP=${wdisjoint_REP:-10000}
run_parallel_grouplock() {
run_parallel_grouplock() {
- PARALLEL_GROUPLOCK=${PARALLEL_GROUPLOCK:-\
- $(which parallel_grouplock 2> /dev/null || true)}
+ PARALLEL_GROUPLOCK=${PARALLEL_GROUPLOCK:-$(which parallel_grouplock \
+ 2> /dev/null || true)}
parallel_grouplock_MINTASKS=${parallel_grouplock_MINTASKS:-5}
if [ "$NFSCLIENT" ]; then
parallel_grouplock_MINTASKS=${parallel_grouplock_MINTASKS:-5}
if [ "$NFSCLIENT" ]; then
FAIL_ON_ERROR=false
# common setup
FAIL_ON_ERROR=false
# common setup
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
clients=${CLIENTS:-$HOSTNAME}
generate_machine_file $clients $MACHINEFILE || \
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
clients=${CLIENTS:-$HOSTNAME}
generate_machine_file $clients $MACHINEFILE || \
num_clients=$(get_node_count ${clients//,/ })
# compilbench
num_clients=$(get_node_count ${clients//,/ })
# compilbench
-#
-cbench_DIR=${cbench_DIR:-"/usr/bin"}
-cbench_IDIRS=${cbench_IDIRS:-4}
-# FIXME: wiki page requirements is 30, do we really need 30 ?
-cbench_RUNS=${cbench_RUNS:-4}
-
if [ "$SLOW" = "no" ]; then
cbench_IDIRS=2
cbench_RUNS=2
fi
if [ "$SLOW" = "no" ]; then
cbench_IDIRS=2
cbench_RUNS=2
fi
-#
-METABENCH=${METABENCH:-$(which metabench 2> /dev/null || true)}
-mbench_NFILES=${mbench_NFILES:-30400}
[ "$SLOW" = "no" ] && mbench_NFILES=10000
[ "$SLOW" = "no" ] && mbench_NFILES=10000
-# threads per client
-mbench_THREADS=${mbench_THREADS:-4}
-#
-cnt_DIR=${cnt_DIR:-""}
-cnt_NRUN=${cnt_NRUN:-10}
[ "$SLOW" = "no" ] && cnt_NRUN=2
[ "$SLOW" = "no" ] && cnt_NRUN=2
-#
-IOR=${IOR:-$(which IOR 2> /dev/null || true)}
-# threads per client
-ior_THREADS=${ior_THREADS:-2}
-ior_iteration=${ior_iteration:-1}
-ior_blockSize=${ior_blockSize:-6} # Gb
-ior_xferSize=${ior_xferSize:-2m}
-ior_type=${ior_type:-POSIX}
-ior_DURATION=${ior_DURATION:-60} # minutes
[ "$SLOW" = "no" ] && ior_DURATION=30
# source the common file after all parameters are set to take affect
[ "$SLOW" = "no" ] && ior_DURATION=30
# source the common file after all parameters are set to take affect
ALWAYS_EXCEPT="parallel_grouplock $PARALLEL_SCALE_EXCEPT"
# common setup
ALWAYS_EXCEPT="parallel_grouplock $PARALLEL_SCALE_EXCEPT"
# common setup
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
clients=${CLIENTS:-$HOSTNAME}
generate_machine_file $clients $MACHINEFILE || \
error "Failed to generate machine file"
num_clients=$(get_node_count ${clients//,/ })
MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
clients=${CLIENTS:-$HOSTNAME}
generate_machine_file $clients $MACHINEFILE || \
error "Failed to generate machine file"
num_clients=$(get_node_count ${clients//,/ })
-#
-cbench_DIR=${cbench_DIR:-""}
-cbench_IDIRS=${cbench_IDIRS:-4}
-# FIXME: wiki page requirements is 30, do we really need 30 ?
-cbench_RUNS=${cbench_RUNS:-4}
-
if [ "$SLOW" = "no" ]; then
cbench_IDIRS=2
cbench_RUNS=2
fi
if [ "$SLOW" = "no" ]; then
cbench_IDIRS=2
cbench_RUNS=2
fi
-#
-METABENCH=${METABENCH:-$(which metabench 2> /dev/null || true)}
-mbench_NFILES=${mbench_NFILES:-30400}
[ "$SLOW" = "no" ] && mbench_NFILES=10000
[ "$SLOW" = "no" ] && mbench_NFILES=10000
-# threads per client
-mbench_THREADS=${mbench_THREADS:-4}
-#
-SIMUL=${SIMUL:=$(which simul 2> /dev/null || true)}
-# threads per client
-simul_THREADS=${simul_THREADS:-2}
-simul_REP=${simul_REP:-20}
[ "$SLOW" = "no" ] && simul_REP=2
[ "$SLOW" = "no" ] && simul_REP=2
-#
-# mib
-#
-MIB=${MIB:=$(which mib 2> /dev/null || true)}
-# threads per client
-mib_THREADS=${mib_THREADS:-2}
-mib_xferSize=${mib_xferSize:-1m}
-mib_xferLimit=${mib_xferLimit:-5000}
-mib_timeLimit=${mib_timeLimit:-300}
-
-#
-# MDTEST
-#
-MDTEST=${MDTEST:=$(which mdtest 2> /dev/null || true)}
-# threads per client
-mdtest_THREADS=${mdtest_THREADS:-2}
-mdtest_nFiles=${mdtest_nFiles:-"100000"}
-# We devide the files by number of core
-mdtest_nFiles=$((mdtest_nFiles/mdtest_THREADS/num_clients))
-mdtest_iteration=${mdtest_iteration:-1}
-
-#
-#
-cnt_DIR=${cnt_DIR:-""}
-cnt_NRUN=${cnt_NRUN:-10}
[ "$SLOW" = "no" ] && cnt_NRUN=2
[ "$SLOW" = "no" ] && cnt_NRUN=2
-#
-CASC_RW=${CASC_RW:-$(which cascading_rw 2> /dev/null || true)}
-# threads per client
-casc_THREADS=${casc_THREADS:-2}
-casc_REP=${casc_REP:-300}
[ "$SLOW" = "no" ] && casc_REP=10
[ "$SLOW" = "no" ] && casc_REP=10
-#
-IOR=${IOR:-$(which IOR 2> /dev/null || true)}
-# threads per client
-ior_THREADS=${ior_THREADS:-2}
-ior_iteration=${ior_iteration:-1}
-ior_blockSize=${ior_blockSize:-6} # Gb
-ior_xferSize=${ior_xferSize:-2m}
-ior_type=${ior_type:-POSIX}
-ior_DURATION=${ior_DURATION:-30} # minutes
[ "$SLOW" = "no" ] && ior_DURATION=5
[ "$SLOW" = "no" ] && ior_DURATION=5
-#
-# threads per client
-write_THREADS=${write_THREADS:-8}
-write_REP=${write_REP:-10000}
[ "$SLOW" = "no" ] && write_REP=100
[ "$SLOW" = "no" ] && write_REP=100
-#
-WRITE_DISJOINT=${WRITE_DISJOINT:-$(which write_disjoint 2> /dev/null || true)}
-# threads per client
-wdisjoint_THREADS=${wdisjoint_THREADS:-4}
-wdisjoint_REP=${wdisjoint_REP:-10000}
[ "$SLOW" = "no" ] && wdisjoint_REP=100
[ "$SLOW" = "no" ] && wdisjoint_REP=100
-#
-# parallel_grouplock
-#
-#
-PARALLEL_GROUPLOCK=${PARALLEL_GROUPLOCK:-\
- $(which parallel_grouplock 2> /dev/null || true)}
-parallel_grouplock_MINTASKS=${parallel_grouplock_MINTASKS:-5}
-
. $LUSTRE/tests/functions.sh
build_test_filter
. $LUSTRE/tests/functions.sh
build_test_filter
}
run_test parallel_grouplock "parallel_grouplock"
}
run_test parallel_grouplock "parallel_grouplock"
-statahead_NUMMNTPTS=${statahead_NUMMNTPTS:-5}
-statahead_NUMFILES=${statahead_NUMFILES:-500000}
-
test_statahead () {
run_statahead
}
test_statahead () {
run_statahead
}