Whamcloud - gitweb
LU-9535 tests: check server version in sanityn 77j 83/30583/2
authorJames Nunez <james.a.nunez@intel.com>
Tue, 5 Dec 2017 23:31:21 +0000 (16:31 -0700)
committerJohn L. Hammond <john.hammond@intel.com>
Thu, 4 Jan 2018 17:51:29 +0000 (17:51 +0000)
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

Lustre-change: https://review.whamcloud.com/30385
Lustre-commit: 8552476c5495a94d22501d002a35830181b5ea7d

Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: Ia2a04b5ae688809d4a84a2dc8459598f02932119
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/30583
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
lustre/tests/sanityn.sh

index 4f8f420..c0be78f 100755 (executable)
@@ -3379,7 +3379,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)
@@ -3434,7 +3434,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