From e418f47688facf07f2e9bd6535b71d484af4f8ac Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Thu, 21 May 2020 13:13:41 +0300 Subject: [PATCH] LU-13086 tests: restore compatibility with mpich The addition of the --oversubscribe MPI option to mpi_run() is OpenMPI specific. Patch moves --oversubscribe to MPIRUN_OPTIONS in local.sh to restore the compatibility with MPICH. Test-Parameters: trivial clientdistro=el8.3 serverdistro=el7.7 testlist=parallel-scale,large-scale,performance-sanity Test-Parameters: clientdistro=el8.4 serverdistro=el7.7 testlist=parallel-scale,large-scale,performance-sanity Fixes: 3c7aca7472 ("LU-12395 build: build mpitests for el8") Cray-bug-id: LUS-8006 Signed-off-by: Elena Gryaznova Change-Id: I0a6fab072212781d12877d2503ae8600cfdc8c7a Reviewed-on: https://review.whamcloud.com/38689 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Andriy Skulysh Reviewed-by: James Nunez --- lustre/tests/cfg/local.sh | 1 + lustre/tests/functions.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh index 5530799..e61bbb8 100644 --- a/lustre/tests/cfg/local.sh +++ b/lustre/tests/cfg/local.sh @@ -150,6 +150,7 @@ SLOW=${SLOW:-no} FAIL_ON_ERROR=${FAIL_ON_ERROR:-true} MPIRUN=${MPIRUN:-$(which mpirun 2>/dev/null || true)} +MPIRUN_OPTIONS=${MPIRUN_OPTIONS:-"--oversubscribe"} MPI_USER=${MPI_USER:-mpiuser} SHARED_DIR_LOGS=${SHARED_DIR_LOGS:-""} MACHINEFILE_OPTION=${MACHINEFILE_OPTION:-"-machinefile"} diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh index 6c5e2e3..0913c84 100644 --- a/lustre/tests/functions.sh +++ b/lustre/tests/functions.sh @@ -169,7 +169,7 @@ signaled() { } mpi_run () { - local mpirun="$MPIRUN $MPIRUN_OPTIONS --oversubscribe" + local mpirun="$MPIRUN $MPIRUN_OPTIONS" local command="$mpirun $@" local mpilog=$TMP/mpi.log local rc -- 1.8.3.1