revert land fix from bug 12609, due group_upcall complete disabled in HEAD.

[fs/lustre-release.git] / lustre / tests / insanity.sh

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 86c46ac..54ae83a 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -17,7 +17,7 @@ CLEANUP=${CLEANUP:-"cleanup"}
 
 build_test_filter
 
-assert_env mds_HOST MDS_MKFS_OPTS MDSDEV
+assert_env mds_HOST MDS_MKFS_OPTS
 assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
 assert_env LIVE_CLIENT FSNAME
 
@@ -179,7 +179,7 @@ fi
 echo "Starting Test 17 at `date`"
 
 test_0() {
-    facet_failover mds
+    facet_failover $SINGLEMDS
     echo "Waiting for df pid: $DFPID"
     wait $DFPID || { echo "df returned $?" && return 1; }
 
@@ -207,12 +207,12 @@ test_2() {
     echo "Verify Lustre filesystem is up and running"
     client_df
 
-    shutdown_facet mds
-    reboot_facet mds
+    shutdown_facet $SINGLEMDS
+    reboot_facet $SINGLEMDS
 
     # prepare for MDS failover
-    change_active mds
-    reboot_facet mds
+    change_active $SINGLEMDS
+    reboot_facet $SINGLEMDS
 
     client_df &
     DFPID=$!
@@ -225,8 +225,8 @@ test_2() {
     wait_for ost1
     start_ost 1 || return 2
 
-    wait_for mds
-    start mds $MDSDEV $MDS_MOUNT_OPTS || return $?
+    wait_for $SINGLEMDS
+    start $SINGLEMDS `mdsdevname 1` $MDS_MOUNT_OPTS || return $?
 
     #Check FS
     wait $DFPID
@@ -245,7 +245,7 @@ test_3() {
     echo "Verify Lustre filesystem is up and running"
     
     #MDS Portion
-    facet_failover mds
+    facet_failover $SINGLEMDS
     wait $DFPID || echo df failed: $?
     #Check FS
 
@@ -265,6 +265,7 @@ test_3() {
     reintegrate_clients || return 1
 
     client_df || return 3
+    sleep 2 # give it a little time for fully recovered before next test
 }
 run_test 3  "Thirdb Failure Mode: MDS/CLIENT `date`"
 ###################################################
@@ -283,12 +284,12 @@ test_4() {
     sleep 5
 
     #MDS Portion
-    shutdown_facet mds
-    reboot_facet mds
+    shutdown_facet $SINGLEMDS
+    reboot_facet $SINGLEMDS
 
     # prepare for MDS failover
-    change_active mds
-    reboot_facet mds
+    change_active $SINGLEMDS
+    reboot_facet $SINGLEMDS
 
     client_df &
     DFPIDB=$!
@@ -300,8 +301,8 @@ test_4() {
     wait_for ost1
     start_ost 1
     
-    wait_for mds
-    start mds $MDSDEV $MDS_MOUNT_OPTS
+    wait_for $SINGLEMDS
+    start $SINGLEMDS `mdsdevname 1` $MDS_MOUNT_OPTS
     #Check FS
     
     wait $DFPIDA
@@ -433,7 +434,7 @@ test_7() {
     client_rm testfile
 
     #MDS Portion
-    facet_failover mds
+    facet_failover $SINGLEMDS
 
     #Check FS
     echo "Test Lustre stability after MDS failover"
@@ -571,7 +572,6 @@ test_10() {
 }
 run_test 10 "Running Availability for 6 hours..."
 
-equals_msg "Done, cleaning up"
+equals_msg `basename $0`: test complete, cleaning up
 $CLEANUP
-echo "$0: completed"
-
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true