From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Wed, 20 Jul 2016 12:18:59 +0000 (-0400)
Subject: LU-8323 tests: Fix interop for set_hostid
X-Git-Tag: 2.8.56~1
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=3f2b0939f8509ab3ef0c2c6843fecd6f63e69485

LU-8323 tests: Fix interop for set_hostid

Version check set_hostid in formatall, since older ZFS doesn't "need"
it.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: Ica354c00cc2e53c533524df2a41b22226173fbfd
Reviewed-on: http://review.whamcloud.com/21438
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 12ec006..08d19ec 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3549,7 +3549,11 @@ format_ost() {
 formatall() {
 	stopall
 	# Set hostid for ZFS/SPL zpool import protection
-	do_rpc_nodes "$(comma_list $(remote_nodes_list))" set_hostid
+	# (Assumes MDS version is also OSS version)
+	if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.8.54) ];
+	then
+	    do_rpc_nodes "$(comma_list $(remote_nodes_list))" set_hostid
+	fi
 
 	# We need ldiskfs here, may as well load them all
 	load_modules