From 8552476c5495a94d22501d002a35830181b5ea7d Mon Sep 17 00:00:00 2001 From: James Nunez Date: Tue, 5 Dec 2017 16:31:21 -0700 Subject: [PATCH] LU-9535 tests: check server version in sanityn 77j The QoS feature in the TBF policy was added to Lustre with tag 2.9.53 and a patch with commit hash d2c403363f6. Thus, sanityn test 77j should only be run for servers with version 2.9.53 and later. Test-Parameters: trivial mdsjob=lustre-b2_9 ossjob=lustre-b2_9 serverbuildno=2 testlist=sanityn Signed-off-by: James Nunez Change-Id: Ia2a04b5ae688809d4a84a2dc8459598f02932119 Reviewed-on: https://review.whamcloud.com/30385 Reviewed-by: Andreas Dilger Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Saurabh Tandan Reviewed-by: Oleg Drokin --- lustre/tests/sanityn.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index fee301a..61e9e73 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -3385,7 +3385,7 @@ tbf_rule_check() } test_77i() { - [ $(lustre_version_code ost1) -ge $(version_code 2.8.55) ] || + [ $(lustre_version_code ost1) -ge $(version_code 2.8.55) ] || { skip "Need OST version at least 2.8.55"; return 0; } for i in $(seq 1 $OSTCOUNT) @@ -3440,7 +3440,11 @@ run_test 77i "Change rank of TBF rule" test_77j() { local idis local rateis - if [ $(lustre_version_code ost1) -ge $(version_code 2.8.60) ]; then + local ost_version=$(lustre_version_code ost1) + + [ $ost_version -ge $(version_code 2.9.53) ] || + { skip "Need OST version at least 2.9.53"; return 0; } + if [ $ost_version -ge $(version_code 2.8.60) ]; then idis="opcode=" rateis="rate=" fi -- 1.8.3.1