From: scjody <scjody>
Date: Wed, 5 Sep 2007 21:16:01 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~1262
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=197c7d7ed9c5911a045aa86fe3e5f6f79fc2fce4;p=fs%2Flustre-release.git

Branch b1_6

Test 74 is now 74b and listed in ALWAYS_EXCEPT.  Test 74a is based on the old
test but passes on patchless clients.

b=13310
i=adilger
i=green
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 7faa80a..fb4b302 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7,8 +7,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 4900 4900 2108 9789 3637 9789 3561 5188/5749 10764
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27o 27q  42a  42b  42c  42d  45   68        75"}
+# bug number for skipped test: 4900 4900 2108 9789 3637 9789 3561 5188/5749 13310 10764
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27o 27q  42a  42b  42c  42d  45   68        74b   75"}
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 60c 63 64b 71 73 101 103 115 120g"
@@ -2869,18 +2869,32 @@ test_73() {
 }
 run_test 73 "multiple MDC requests (should not deadlock)"
 
-test_74() { # bug 6149, 6184
+test_74a() { # bug 6149, 6184
 	#define OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT 0x30e
 	#
 	# very important to OR with OBD_FAIL_ONCE (0x80000000) -- otherwise it
 	# will spin in a tight reconnection loop
+	touch $DIR/f74a
 	sysctl -w lustre.fail_loc=0x8000030e
-	# get any lock
-	touch $DIR/f74
+	# get any lock that won't be difficult - lookup works.
+	ls $DIR/f74a
 	sysctl -w lustre.fail_loc=0
 	true
 }
-run_test 74 "ldlm_enqueue freed-export error path (shouldn't LBUG)"
+run_test 74a "ldlm_enqueue freed-export error path, ls (shouldn't LBUG)"
+
+test_74b() { # bug 13310
+	#define OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT 0x30e
+	#
+	# very important to OR with OBD_FAIL_ONCE (0x80000000) -- otherwise it
+	# will spin in a tight reconnection loop
+	sysctl -w lustre.fail_loc=0x8000030e
+	# get a "difficult" lock
+	touch $DIR/f74b
+	sysctl -w lustre.fail_loc=0
+	true
+}
+run_test 74b "ldlm_enqueue freed-export error path, touch (shouldn't LBUG)"
 
 JOIN=${JOIN:-"lfs join"}
 F75=$DIR/f75