LU-17368 tests: init the variables in correct order

recovery-scale-lib expects the CLIENTS set:
  NODES_TO_USE=${NODES_TO_USE:-$CLIENTS}

but this variable initialized later:
  init_logging() ->
    init_clients_lists () ->
      export CLIENTS=$(comma_list $clients)

This wrong order leads to empty NODES_TO_USE and
recovery-*-scale tests failed with:
   dd: ssh: Could not resolve hostname dd: Name or service not known

Test-Parameters: trivial env=SLOW=no,FAILURE_MODE=HARD \
    clientcount=4 mdtcount=1 mdscount=2 osscount=2 \
    austeroptions=-R failover=true iscsi=1 \
    testlist=recovery-mds-scale,recovery-oss-scale,recovery-random-scale

Fixes: 2c12b93ccb ("LU-9798 tests: split server recovery tests")
HPE-bug-id: LUS-12058
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
Change-Id: I3967c7cca7f480610defbeba09b9f5628f7085d3
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53477
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Vladimir Saveliev <vladimir.saveliev@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh
index fdda222..7b68a14 100644 (file)
--- a/lustre/tests/recovery-mds-scale.sh
+++ b/lustre/tests/recovery-mds-scale.sh
@@ -11,9 +11,9 @@ ONLY=${ONLY:-"$*"}
 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-. $LUSTRE/tests/recovery-scale-lib.sh
 init_test_env "$@"
 init_logging
+. $LUSTRE/tests/recovery-scale-lib.sh
 
 # bug number for skipped test:
 ALWAYS_EXCEPT="$RECOVERY_MDS_SCALE_EXCEPT "

diff --git a/lustre/tests/recovery-oss-scale.sh b/lustre/tests/recovery-oss-scale.sh
index 7a4c137..ed69bbe 100644 (file)
--- a/lustre/tests/recovery-oss-scale.sh
+++ b/lustre/tests/recovery-oss-scale.sh
@@ -11,9 +11,9 @@ ONLY=${ONLY:-"$*"}
 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-. $LUSTRE/tests/recovery-scale-lib.sh
 init_test_env "$@"
 init_logging
+. $LUSTRE/tests/recovery-scale-lib.sh
 
 # bug number for skipped test:
 ALWAYS_EXCEPT="$RECOVERY_OSS_SCALE_EXCEPT "

diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh
index 8bdd6d8..b07e420 100644 (file)
--- a/lustre/tests/recovery-random-scale.sh
+++ b/lustre/tests/recovery-random-scale.sh
@@ -15,9 +15,9 @@ ONLY=${ONLY:-"$*"}
 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-. $LUSTRE/tests/recovery-scale-lib.sh
 init_test_env "$@"
 init_logging
+. $LUSTRE/tests/recovery-scale-lib.sh
 
 # bug number for skipped test:
 ALWAYS_EXCEPT="$RECOVERY_RANDOM_SCALE_EXCEPT "