From f523ef29ff13e8de3e0e00e4cb9c04065baf354f Mon Sep 17 00:00:00 2001
From: Dmitry Zogin <dmitry.zogin@sun.com>
Date: Fri, 2 Apr 2010 11:28:19 -0400
Subject: [PATCH] b=22137 kernel oops at replay-single test_61d.

 replay-single.sh test_61d was modified to operate with MGS in case of
 the different MGS and MDS.

 i=grev
---
 lustre/tests/cfg/local.sh      |  1 +
 lustre/tests/replay-single.sh  | 10 +++++-----
 lustre/tests/test-framework.sh |  5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 1db93d8..94232fd 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -79,6 +79,7 @@ OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID -
 
 MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o loop"}
 OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o loop"}
+mgs_MOUNT_OPTS=${mgs_MOUNT_OPTS:-$MDS_MOUNT_OPTS}
 
 #client
 MOUNT=${MOUNT:-/mnt/${FSNAME}}
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index d6ea71a..cce3326 100644
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1477,11 +1477,11 @@ run_test 61c "test race mds llog sync vs llog cleanup"
 
 test_61d() { # bug 16002
 #define OBD_FAIL_OBD_LLOG_SETUP        0x605
-    stop mds
-    do_facet mds "lctl set_param fail_loc=0x80000605"
-    start mds $MDSDEV $MDS_MOUNT_OPTS && error "mds start should have failed"
-    do_facet mds "lctl set_param fail_loc=0"
-    start mds $MDSDEV $MDS_MOUNT_OPTS || error "cannot restart mds"
+    stop mgs
+    do_facet mgs "lctl set_param fail_loc=0x80000605"
+    start mgs $MGSDEV $mgs_MOUNT_OPTS && error "mgs start should have failed"
+    do_facet mgs "lctl set_param fail_loc=0"
+    start mgs $MGSDEV $mgs_MOUNT_OPTS || error "cannot restart mgs"
 }
 run_test 61d "error in llog_setup should cleanup the llog context correctly"
 
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index c46629a..1913a05 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1402,8 +1402,11 @@ ostdevname() {
     echo -n $DEVPTR
 }
 
-facet_mntpt () {
+facet_mntpt() {
     local facet=$1
+    if combined_mgs_mds && [[ $facet = "mgs" ]]  ; then
+        facet="mds"
+    fi
     local var=${facet}_MOUNT
     eval mntpt=${!var:-${MOUNT%/*}/$facet}
 
-- 
1.8.3.1