From bc1d8b792ae61de6cc82175a26b097574c64eb50 Mon Sep 17 00:00:00 2001 From: James Nunez Date: Thu, 26 Aug 2021 17:27:16 -0600 Subject: [PATCH] LU-14264 tests: make PARALLEL available to all suites MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The PARALLEL environment variable is checked and a default value is set in the sanity test suite, but recovery-small also uses PARALLEL and does not check/initialize it. Move check and set the PARALLEL environment variable to a default value in the init_test_env() routine in test-framework.sh. Fixes: 688d5da6a89 (“LU-12846 mdd: return error while delete failed”) Fixes: 26e8f1137b8 (“LU-13116 mgc: do not lose sptlrpc config lock”) Test-Parameters: trivial testlist=sanity,recovery-small Signed-off-by: James Nunez Change-Id: If773e2ea7300056a0ef00a2cb24e13e20a971bd6 Reviewed-on: https://review.whamcloud.com/44763 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 1 - lustre/tests/test-framework.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index a016ff3..9b9e87f 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -28,7 +28,6 @@ ACCEPTOR_PORT=${ACCEPTOR_PORT:-988} DEF_STRIPE_COUNT=-1 CHECK_GRANT=${CHECK_GRANT:-"yes"} GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""} -export PARALLEL=${PARALLEL:-"no"} TRACE=${TRACE:-""} LUSTRE=${LUSTRE:-$(dirname $0)/..} diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 0b94bb0..2776488 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -433,6 +433,7 @@ init_test_env() { export LOV_MAX_STRIPE_COUNT=2000 export DELETE_OLD_POOLS=${DELETE_OLD_POOLS:-false} export KEEP_POOLS=${KEEP_POOLS:-false} + export PARALLEL=${PARALLEL:-"no"} export MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines} . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} -- 1.8.3.1