From: Lai Siyao <lai.siyao@intel.com>
Date: Wed, 23 Sep 2015 06:35:55 +0000 (+0800)
Subject: LU-7191 test: sanity 27z failed on DNE with ZFS
X-Git-Tag: 2.7.61~5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c3c215a8c07ac2aa016e564fdb87373a4cc2063a;p=fs%2Flustre-release.git

LU-7191 test: sanity 27z failed on DNE with ZFS

Because ZFS osd always use LPU64 as OST object name, sanity 27z
function check_seq_oid() should follow this semantic to check
obj, otherwise it will not find OST obj.

Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Change-Id: I28f9a2db291f89c16bd142886c195da64c6817bb
Reviewed-on: http://review.whamcloud.com/16605
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 63a3c4e..31db4fe 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1844,7 +1844,7 @@ check_seq_oid()
 		log "want: stripe:$stripe_nr ost:$obdidx oid:$oid/$hex seq:$seq"
 
 		seq=$(echo $seq | sed -e "s/^0x//g")
-		if [ $seq == 0 ]; then
+		if [ $seq == 0 ] || [ $(facet_fstype ost$ost) == zfs ]; then
 			oid_hex=$(echo $oid)
 		else
 			oid_hex=$(echo $hex | sed -e "s/^0x//g")