Skip to content

Commit a2ef61d

Browse files
author
Oleg Drokin
committed
LU-12482 tests: use MDS1_VERSION in sanity-hsm
MDS_VERSION_CODE is long deprecated and undefined. Change-Id: I007cea54cb4ddbc5705656a84d12448dd84aa0a1 Test-Parameters: trivial Test-Parameters: testlist=sanity-hsm,sanity-hsm Signed-off-by: Oleg Drokin <[email protected]> Reviewed-on: https://review.whamcloud.com/35353 Tested-by: jenkins <[email protected]> Tested-by: Maloo <[email protected]> Reviewed-by: James Nunez <[email protected]> Reviewed-by: Andreas Dilger <[email protected]>
1 parent 8fbef5e commit a2ef61d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

lustre/tests/sanity-hsm.sh

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ test_1c() {
753753
run_test 1c "Check setting archive-id in lfs hsm_set"
754754

755755
test_1d() {
756-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.59) ] &&
756+
[ $MDS1_VERSION -lt $(version_code 2.10.59) ] &&
757757
skip "need MDS version at least 2.10.59"
758758

759759
mkdir -p $DIR/$tdir
@@ -1347,7 +1347,7 @@ test_12p() {
13471347
run_test 12p "implicit restore of a file on copytool mount point"
13481348

13491349
test_12q() {
1350-
[ $MDS_VERSION_CODE -lt $(version_code 2.7.58) ] &&
1350+
[ $MDS1_VERSION -lt $(version_code 2.7.58) ] &&
13511351
skip "need MDS version at least 2.7.58"
13521352

13531353
stack_trap "zconf_umount \"$(facet_host $SINGLEAGT)\" \"$MOUNT3\"" EXIT
@@ -1988,7 +1988,7 @@ test_24f() {
19881988
run_test 24f "root can archive, release, and restore tar files"
19891989

19901990
test_24g() {
1991-
[ $MDS_VERSION_CODE -lt $(version_code 2.11.56) ] &&
1991+
[ $MDS1_VERSION -lt $(version_code 2.11.56) ] &&
19921992
skip "need MDS version 2.11.56 or later"
19931993

19941994
local file=$DIR/$tdir/$tfile
@@ -3022,7 +3022,7 @@ run_test 58 "Truncate a released file will trigger restore"
30223022

30233023
test_59() {
30243024
local fid
3025-
[[ $MDS_VERSION_CODE -lt $(version_code 2.7.63) ]] &&
3025+
[[ $MDS1_VERSION -lt $(version_code 2.7.63) ]] &&
30263026
skip "Need MDS version at least 2.7.63"
30273027

30283028
copytool setup
@@ -4343,7 +4343,7 @@ run_test 253 "Check for wrong file size after release"
43434343

43444344
test_254a()
43454345
{
4346-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.56) ] &&
4346+
[ $MDS1_VERSION -lt $(version_code 2.10.56) ] &&
43474347
skip "need MDS version at least 2.10.56"
43484348

43494349
# Check that the counters are initialized to 0
@@ -4361,7 +4361,7 @@ run_test 254a "Request counters are initialized to zero"
43614361

43624362
test_254b()
43634363
{
4364-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.56) ] &&
4364+
[ $MDS1_VERSION -lt $(version_code 2.10.56) ] &&
43654365
skip "need MDS version at least 2.10.56"
43664366

43674367
# The number of request to launch (at least 32)
@@ -4487,7 +4487,7 @@ run_test 255 "Copytool registration wakes the coordinator up"
44874487
# break in the future because of that.
44884488
test_260a()
44894489
{
4490-
[ $MDS_VERSION_CODE -lt $(version_code 2.11.56) ] &&
4490+
[ $MDS1_VERSION -lt $(version_code 2.11.56) ] &&
44914491
skip "need MDS version 2.11.56 or later"
44924492

44934493
local -a files=("$DIR/$tdir/$tfile".{0..15})
@@ -4553,7 +4553,7 @@ run_test 260a "Restore request have priority over other requests"
45534553
# mechanism in the coordinator. It might not make sense to keep it in the future
45544554
test_260b()
45554555
{
4556-
[ $MDS_VERSION_CODE -lt $(version_code 2.11.56) ] &&
4556+
[ $MDS1_VERSION -lt $(version_code 2.11.56) ] &&
45574557
skip "need MDS version 2.11.56 or later"
45584558

45594559
local -a files=("$DIR/$tdir/$tfile".{0..15})
@@ -4993,7 +4993,7 @@ run_test 405 "archive and release under striped directory"
49934993
test_406() {
49944994
[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
49954995

4996-
[ $MDS_VERSION_CODE -lt $(version_code 2.7.64) ] &&
4996+
[ $MDS1_VERSION -lt $(version_code 2.7.64) ] &&
49974997
skip "need MDS version at least 2.7.64"
49984998

49994999
local fid
@@ -5086,7 +5086,7 @@ run_test 407 "Check for double RESTORE records in llog"
50865086

50875087
test_500()
50885088
{
5089-
[ $MDS_VERSION_CODE -lt $(version_code 2.6.92) ] &&
5089+
[ $MDS1_VERSION -lt $(version_code 2.6.92) ] &&
50905090
skip "HSM migrate is not supported"
50915091

50925092
test_mkdir -p $DIR/$tdir
@@ -5104,7 +5104,7 @@ test_500()
51045104
run_test 500 "various LLAPI HSM tests"
51055105

51065106
test_600() {
5107-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5107+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
51085108
skip "need MDS version at least 2.10.58"
51095109

51105110
mkdir -p $DIR/$tdir
@@ -5137,7 +5137,7 @@ test_600() {
51375137
run_test 600 "Changelog fields 'u=' and 'nid='"
51385138

51395139
test_601() {
5140-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5140+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
51415141
skip "need MDS version at least 2.10.58"
51425142

51435143
mkdir -p $DIR/$tdir
@@ -5160,7 +5160,7 @@ test_601() {
51605160
run_test 601 "OPEN Changelog entry"
51615161

51625162
test_602() {
5163-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5163+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
51645164
skip "need MDS version at least 2.10.58"
51655165

51665166
mkdir -p $DIR/$tdir
@@ -5207,7 +5207,7 @@ test_602() {
52075207
run_test 602 "Changelog record CLOSE only if open+write or OPEN recorded"
52085208

52095209
test_603() {
5210-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5210+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
52115211
skip "need MDS version at least 2.10.58"
52125212

52135213
mkdir -p $DIR/$tdir
@@ -5232,7 +5232,7 @@ test_603() {
52325232
run_test 603 "GETXATTR Changelog entry"
52335233

52345234
test_604() {
5235-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5235+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
52365236
skip "need MDS version at least 2.10.58"
52375237

52385238
mkdir -p $DIR/$tdir
@@ -5308,7 +5308,7 @@ test_604() {
53085308
run_test 604 "NOPEN Changelog entry"
53095309

53105310
test_605() {
5311-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5311+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
53125312
skip "need MDS version at least 2.10.58"
53135313

53145314
mkdir -p $DIR/$tdir
@@ -5390,7 +5390,7 @@ test_605() {
53905390
run_test 605 "Test OPEN and CLOSE rate limit in Changelogs"
53915391

53925392
test_606() {
5393-
[ $MDS_VERSION_CODE -lt $(version_code 2.10.58) ] &&
5393+
[ $MDS1_VERSION -lt $(version_code 2.10.58) ] &&
53945394
skip "need MDS version at least 2.10.58"
53955395

53965396
local llog_reader=$(do_facet mgs "which llog_reader 2> /dev/null")

0 commit comments

Comments
 (0)