From 8f02d0daf748403cc4fc5bdeb707dcbec51a24a5 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Thu, 5 Nov 2009 13:35:41 +0000
Subject: [PATCH] b=19242 i=Robert.Read additional mdcdev check

---
 lustre/tests/replay-single.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 2dff201..034aa8d 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -868,7 +868,8 @@ test_44a() {	# was test_44
     local at_max_saved=0
 
     mdcdev=`lctl get_param -n devices | awk '/-mdc-/ {print $1}'`
-    [ "$mdcdev" ] || exit 2
+    [ "$mdcdev" ] || return 2
+    [ $(echo $mdcdev | wc -w) -eq 1 ] || { echo $mdcdev=$mdcdev && return 3; }
 
     # adaptive timeouts slow this way down
     if at_is_enabled; then
@@ -881,7 +882,7 @@ test_44a() {	# was test_44
 	do_facet mds "lctl get_param -n mdt.MDS.mds.timeouts | grep service"
 	#define OBD_FAIL_TGT_CONN_RACE     0x701
 	do_facet mds "lctl set_param fail_loc=0x80000701"
-	$LCTL --device $mdcdev recover
+	$LCTL --device $mdcdev recover || return 4
 	df $MOUNT
     done
 
@@ -892,14 +893,16 @@ test_44a() {	# was test_44
 run_test 44a "race in target handle connect"
 
 test_44b() {
-    mdcdev=`lctl get_param -n devices | awk '/-mdc-/ {print $1}'`
-    [ "$mdcdev" ] || exit 2
+    local mdcdev=`lctl get_param -n devices | awk '/-mdc-/ {print $1}'`
+    [ "$mdcdev" ] || return 2
+    [ $(echo $mdcdev | wc -w) -eq 1 ] || { echo $mdcdev=$mdcdev && return 3; }
+
     for i in `seq 1 10`; do
 	echo "$i of 10 ($(date +%s))"
 	do_facet mds "lctl get_param -n mdt.MDS.mds.timeouts | grep service"
 	#define OBD_FAIL_TGT_DELAY_RECONNECT 0x704
 	do_facet mds "lctl set_param fail_loc=0x80000704"
-	$LCTL --device $mdcdev recover
+	$LCTL --device $mdcdev recover || return 4
 	df $MOUNT
     done
     do_facet mds "lctl set_param fail_loc=0"
@@ -909,9 +912,11 @@ run_test 44b "race in target handle connect"
 
 # Handle failed close
 test_45() {
-    mdcdev=`lctl get_param -n devices | awk '/-mdc-/ {print $1}'`
-    [ "$mdcdev" ] || exit 2
-    $LCTL --device $mdcdev recover
+    local mdcdev=`lctl get_param -n devices | awk '/-mdc-/ {print $1}'`
+    [ "$mdcdev" ] || return 2
+    [ $(echo $mdcdev | wc -w) -eq 1 ] || { echo $mdcdev=$mdcdev && return 3; }
+
+    $LCTL --device $mdcdev recover || return 6 
 
     multiop_bg_pause $DIR/$tfile O_c || return 1
     pid=$!
-- 
1.8.3.1