From: Jian Yu <jian.yu@intel.com>
Date: Wed, 22 Oct 2014 06:34:04 +0000 (-0700)
Subject: LU-5606 tests: add version check codes to conf-sanity test 41c
X-Git-Tag: 2.5.3.90~48
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b4bb70f54faabf1eb50e67a8ad7a09cee4e5c9a5;p=fs%2Flustre-release.git

LU-5606 tests: add version check codes to conf-sanity test 41c

This patch adds Lustre version check codes into conf-sanity test
41c to make the test interoperate with servers that do not have
commit 166c5ba95cb2a4771317e030a3649e4480c8cbad.

Test-Parameters: alwaysuploadlogs envdefinitions=ONLY=41c \
ossjob=lustre-b2_4 mdsjob=lustre-b2_4 ossbuildno=73 mdsbuildno=73 \
testlist=conf-sanity

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I605e43954ba7015002dabcaee1cd587c898fa6cb
Reviewed-on: http://review.whamcloud.com/12375
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 6a65d34..796f353 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2553,6 +2553,15 @@ test_41b() {
 run_test 41b "mount mds with --nosvc and --nomgs on first mount"
 
 test_41c() {
+	local server_version=$(lustre_version_code $SINGLEMDS)
+
+	[[ $server_version -ge $(version_code 2.6.52) ]] ||
+	[[ $server_version -ge $(version_code 2.5.26) &&
+	   $server_version -lt $(version_code 2.5.50) ]] ||
+	[[ $server_version -ge $(version_code 2.5.3) &&
+	   $server_version -lt $(version_code 2.5.11) ]] ||
+		{ skip "Need MDS version 2.5.4+ or 2.5.26+ or 2.6.52+"; return; }
+
 	cleanup
 	# MDT concurent start
 	#define OBD_FAIL_TGT_DELAY_CONNECT 0x703