From d25b63be75335fd1c14712bc90121668ed71db1c Mon Sep 17 00:00:00 2001
From: dzogin <dzogin>
Date: Fri, 25 Sep 2009 17:45:17 +0000
Subject: [PATCH]  Branch b1_8  b=18674  i=alexey.lyashkov  i=nathan.ruthman
 ---------------------------------------------------------------------- 
 Modified Files:   Tag: b1_8  	lustre/ChangeLog lustre/tests/conf-sanity.sh
 ----------------------------------------------------------------------
 Description: Conf-sanity.sh test to check client reconnection to a busy
 server.

---
 lustre/ChangeLog            |  4 +++
 lustre/tests/conf-sanity.sh | 71 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d5ae93f..1eccae9 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -16,6 +16,10 @@ tbd Sun Microsystems, Inc.
 	  more information, please refer to bugzilla 17630.
 
 Severity   : normal
+Bugzilla   : 18674
+Description: Conf-sanity.sh test to check client reconnection to a busy server.
+
+Severity   : normal
 Bugzilla   : 16774
 Description: optimize the extent lock finding during read/write at client side
 
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 36dfc89..ba8ed3b 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1188,7 +1188,7 @@ test_34c() {
 }
 run_test 34c "force umount with failed ost should be normal"
 
-test_35() { # bug 12459
+test_35a() { # bug 12459
 	setup
 
 	debugsave
@@ -1201,7 +1201,7 @@ test_35() { # bug 12459
 	log "Wait for RECONNECT_INTERVAL seconds (10s)"
 	sleep 10
 
-	MSG="conf-sanity.sh test_35 `date +%F%kh%Mm%Ss`"
+	MSG="conf-sanity.sh test_35a `date +%F%kh%Mm%Ss`"
 	$LCTL clear
 	log "$MSG"
 	log "Stopping the MDT:"
@@ -1232,7 +1232,72 @@ test_35() { # bug 12459
 	[ "$NEXTCONN" != "0" ] && log "The client didn't try to reconnect to the last active server (tried ${NEXTCONN} instead)" && return 7
 	cleanup
 }
-run_test 35 "Reconnect to the last active server first"
+run_test 35a "Reconnect to the last active server first"
+
+test_35b() { # bug 18674
+	remote_mds || { skip "local MDS" && return 0; }
+	setup
+
+	debugsave
+	$LCTL set_param debug="ha"
+	$LCTL clear
+	MSG="conf-sanity.sh test_35b `date +%F%kh%Mm%Ss`"
+	log "$MSG"
+
+	log "Set up a fake failnode for the MDS"
+	FAKENID="127.0.0.2"
+	do_facet mds $LCTL conf_param ${FSNAME}-MDT0000.failover.node=$FAKENID || \
+		return 1
+
+	local at_max_saved=0
+	# adaptive timeouts may prevent seeing the issue 
+	if at_is_enabled; then
+		at_max_saved=$(at_max_get mds)
+		at_max_set 0 mds client
+	fi
+
+	mkdir -p $MOUNT/testdir
+	touch $MOUNT/testdir/test
+
+	log "Injecting EBUSY on MDS"
+	# Setting OBD_FAIL_MDS_RESEND=0x136
+	do_facet mds "$LCTL set_param fail_loc=0x80000136" || return 2
+
+	log "Stat on a test file"
+	stat $MOUNT/testdir/test
+
+	log "Stop injecting EBUSY on MDS"
+	do_facet mds "$LCTL set_param fail_loc=0" || return 3
+	rm -f $MOUNT/testdir/test
+
+	log "done"
+	# restore adaptive timeout
+	[ $at_max_saved -ne 0 ] && at_max_set $at_max_saved mds client
+
+	$LCTL dk $TMP/lustre-log-$TESTNAME.log
+
+	# retrieve from the log if the client has ever tried to
+	# contact the fake server after the loss of connection
+	FAILCONN=`awk "BEGIN {ret = 0;}
+		       /import_select_connection.*${FSNAME}-MDT0000-mdc.* using connection/ {
+				ret = 1;
+				if (\\\$NF ~ /$FAKENID/) {
+					ret = 2;
+					exit;
+				}
+		       }
+		       END {print ret}" $TMP/lustre-log-$TESTNAME.log`
+
+	[ "$FAILCONN" == "0" ] && \
+		log "ERROR: The client reconnection has not been triggered" && \
+		return 4
+	[ "$FAILCONN" == "2" ] && \
+		log "ERROR: The client tried to reconnect to the failover server while the primary was busy" && \
+		return 5
+
+        cleanup
+}
+run_test 35b "Continue reconnection retries, if the active server is busy"
 
 test_36() { # 12743
         local rc
-- 
1.8.3.1