From 06ec94583b98fd493661b8863a7d660537198c91 Mon Sep 17 00:00:00 2001
From: Elena Gryaznova <grev@sun.com>
Date: Thu, 18 Mar 2010 23:28:51 +0300
Subject: [PATCH] b=21991 sanity test_53, test_67* interop 18 <-> 20 fix

i=Andreas.Dilger
---
 lustre/tests/sanity.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 5093ca7..43b81c1 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2396,7 +2396,8 @@ test_53() {
 	local ost_last
 	local ostnum
 
-	for VALUE in $(do_facet mds lctl get_param osc.*-osc.prealloc_last_id); do
+	local mdtosc=$(get_mdtosc_proc_path '*')
+	for VALUE in $(do_facet mds lctl get_param osc.$mdtosc.prealloc_last_id); do
 		param=`echo ${VALUE[0]} | cut -d "=" -f1`;
 		ostname=`echo $param | cut -d "." -f2 | cut -d - -f 1-2`
 		mds_last=$(do_facet mds lctl get_param -n $param)
@@ -3090,6 +3091,13 @@ run_test 66 "update inode blocks count on client ==============="
 
 test_67a() { # was test_67 bug 3285 - supplementary group fails on MDS, passes on client
 	[ "$RUNAS_ID" = "$UID" ] && skip "RUNAS_ID = UID = $UID -- skipping" && return
+
+	# interop 18 <-> 20
+	local lustre_version=$(get_lustre_version mds)
+	if [[ $lustre_version != 1.8* ]]; then
+		skip mds running $lustre_version, no group_upcall
+		return 0
+	fi
 	check_kernel_version 35 || return 0
 	mkdir -p $DIR/$tdir
 	chmod 771 $DIR/$tdir
@@ -3113,6 +3121,13 @@ cleanup_67b() {
 }
 
 test_67b() { # bug 3285 - supplementary group fails on MDS, passes on client
+	# interop 18 <-> 20
+	local lustre_version=$(get_lustre_version mds)
+	if [[ $lustre_version != 1.8* ]]; then
+		skip mds running $lustre_version, no group_upcall
+		return 0
+	fi
+
 	# needs to be in /etc/groups on MDS, gid == uid
 	# Let's use RUNAS_ID
 	T67_UID=${T67_UID:-$RUNAS_ID}
-- 
1.8.3.1