From 7501e06974797d38610216b87540cdbae3aaf121 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Wed, 10 Oct 2018 18:55:17 +0300 Subject: [PATCH] LU-11496 tests: start_client_loads () fix recovery-*-scale tests are not functional with LOADS=IOR because of MPIRUN and MPIRUN_OPTIONS are not set. Patch fixes this defect. Test-Parameters: trivial Signed-off-by: Elena Gryaznova Cray-bug-id: LUS-6220 Reviewed-by: Andriy Skulysh Reviewed-by: Alexander Boyko Change-Id: I9b6d3810978260c0cec4a5482f093f788651aac0 Reviewed-on: https://review.whamcloud.com/33339 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Alexandr Boyko Reviewed-by: Oleg Drokin --- lustre/tests/run_IOR.sh | 5 ++--- lustre/tests/test-framework.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lustre/tests/run_IOR.sh b/lustre/tests/run_IOR.sh index 4e44df4..98379f5 100755 --- a/lustre/tests/run_IOR.sh +++ b/lustre/tests/run_IOR.sh @@ -45,9 +45,8 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do chmod -R 777 $TESTDIR sync - mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \ - -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) $IOR -a POSIX -b 1g \ - -o $TESTDIR/IOR-file -s 1 -t 1m -v -w -r 1>$LOG & + + run_ior fpp $TESTDIR 1>$LOG & load_pid=$! wait $load_pid diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 1a044d2..10b7451 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -2638,6 +2638,18 @@ start_client_load() { LFS=$LFS \ LCTL=$LCTL \ FSNAME=$FSNAME \ + MPIRUN=$MPIRUN \ + MPIRUN_OPTIONS=\\\"$MPIRUN_OPTIONS\\\" \ + MACHINEFILE_OPTION=\\\"$MACHINEFILE_OPTION\\\" \ + num_clients=$(get_node_count ${CLIENTS//,/ }) \ + ior_THREADS=$ior_THREADS ior_iteration=$ior_iteration \ + ior_blockSize=$ior_blockSize \ + ior_blockUnit=$ior_blockUnit \ + ior_xferSize=$ior_xferSize ior_type=$ior_type \ + ior_DURATION=$ior_DURATION \ + ior_stripe_params=\\\"$ior_stripe_params\\\" \ + ior_custom_params=\\\"$ior_custom_param\\\" \ + mpi_ior_custom_threads=$mpi_ior_custom_threads \ run_${load}.sh" & local ppid=$! log "Started client load: ${load} on $client" -- 1.8.3.1