From cf2e838320f50a1fc320e74d4c051772b8742742 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 25 Jul 2019 12:35:20 -0600 Subject: [PATCH] LU-11607 tests: add a default definition for SINGLEMDS Move the $SINGLEMDS definition from the test config file into get_lustre_env() so that it is always set. It should use facet "mds1", anything else probably doesn't work. Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: Iecbd6fe7d5102da7c2c14741c85986cf73054035 Reviewed-on: https://review.whamcloud.com/36093 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Wei Liu Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/cfg/local.sh | 1 - lustre/tests/test-framework.sh | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh index 2acd4ab..df6c5c3 100644 --- a/lustre/tests/cfg/local.sh +++ b/lustre/tests/cfg/local.sh @@ -96,7 +96,6 @@ LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-false} DEF_STRIPE_SIZE=${DEF_STRIPE_SIZE:-} # filesystem default stripe size in bytes DEF_STRIPE_COUNT=${DEF_STRIPE_COUNT:-} # filesystem default stripe count -SINGLEMDS=${SINGLEMDS:-"mds1"} TIMEOUT=${TIMEOUT:-20} PTLDEBUG=${PTLDEBUG:-"vfstrace rpctrace dlmtrace neterror ha config \ ioctl super lfsck"} diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 24a6081..9b78323 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -164,6 +164,10 @@ get_lustre_env() { export MDS1_VERSION=$(lustre_version_code mds1) export OST1_VERSION=$(lustre_version_code ost1) export CLIENT_VERSION=$(lustre_version_code client) + + # Prefer using "mds1" directly instead of SINGLEMDS. + # Keep this for compat until it is removed from scripts. + export SINGLEMDS=${SINGLEMDS:-mds1} } init_test_env() { -- 1.8.3.1