From: James Nunez <james.a.nunez@intel.com>
Date: Wed, 27 May 2015 15:09:17 +0000 (-0600)
Subject: LU-6652 tests: replay-dual test 18 stats wrong file
X-Git-Tag: 2.7.55~10
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8d2fd0a18133484fd84456f1626b3af2a53dfa8c;p=fs%2Flustre-release.git

LU-6652 tests: replay-dual test 18 stats wrong file

replay-dual test 18 touches file $MOUNT1/$tdir/$tfile and
then calls statmany on $MOUNT1/$tdir/f. File 'f' does not
exist and statmany fails. This is corrected by touching
$MOUNT1/$tdir/${tfile}0.

Test-Parameters: alwaysuploadlogs envdefinitions=ONLY=18 \
testlist=replay-dual

Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I27b51a1bdff17c4bbc4e9d261d01686612099069
Reviewed-on: http://review.whamcloud.com/14960
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Justin Miller <jmiller@cray.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 69c7b20..fa775ab 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -437,11 +437,11 @@ test_18() { # bug 3822 - evicting client with enqueued lock
 	local DLMTRACE=$(do_facet $SINGLEMDS lctl get_param debug)
 	do_facet $SINGLEMDS lctl set_param debug=+dlmtrace
 	mkdir -p $MOUNT1/$tdir || error "mkdir $MOUNT1/$tdir failed"
-	touch $MOUNT1/$tdir/$tfile
-	#define OBD_FAIL_LDLM_ENQUEUE_BLOCKED    0x30b
-	statmany -s $MOUNT1/$tdir/f 1 500 &
+	touch $MOUNT1/$tdir/${tfile}0 || error "touch file failed"
+	statmany -s $MOUNT1/$tdir/$tfile 1 500 &
 	OPENPID=$!
 	NOW=$(date +%s)
+	#define OBD_FAIL_LDLM_ENQUEUE_BLOCKED    0x30b
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x8000030b  # hold enqueue
 	sleep 1
 	#define OBD_FAIL_LDLM_BL_CALLBACK_NET			0x305