- insanity cleanups.

 - Call the right function to shutdown the osts
 - just sleep when powering off the machine.
 - use checkstat, instead of ls -ld

diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index 4ce742f..688d5e1 100644 (file)
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -9,7 +9,7 @@ FAIL_CLIENTS=${FAIL_CLIENTS:-""}
 
 NETTYPE=${NETTYPE:-tcp}
 TIMEOUT=${TIMEOUT:-30}
-PTLDEBUG=${PTLDEBUG:-'"ha|info|ioctl|malloc"'}
+PTLDEBUG=${PTLDEBUG:-0}
 MOUNT=${MOUNT:-"/mnt/lustre"}
 #CLIENT_UPCALL=${CLIENT_UPCALL:-`pwd`/client-upcall-mdev.sh}
 UPCALL=${CLIENT_UPCALL:-`pwd`/replay-single-upcall.sh}

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 7a9b58f..48ed0fd 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -111,7 +111,7 @@ setup() {
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     wait_for mds
     start mds $MDSLCONFARGS ${REFORMAT}
-    while ! $PDSH $HOST "ls -ld $LUSTRE"; do sleep 5; done
+    while ! $PDSH $HOST "$CHECKSTAT -t dir $LUSTRE"; do sleep 5; done
     do_node $CLIENTS lconf --node client_facet \
        --select mds_service=$ACTIVEMDS $XMLCONFIG
 }
@@ -316,7 +316,7 @@ test_5() {
     
     #OST Portion
     echo "Failing OST"
-    shutdown_node ost2
+    shutdown_facet ost2
     reboot_facet ost2
 
     #Check FS
@@ -348,7 +348,7 @@ test_6() {
        
     #OST Portion
     echo "Failing OST"
-    shutdown_node ost1
+    shutdown_facet ost1
     reboot_facet ost1
 
     #Check FS
@@ -457,7 +457,7 @@ test_8() {
 
     #OST Portion
     echo "Failing OST"
-    shutdown_node ost1
+    shutdown_facet ost1
     reboot_facet ost1
 
     #Check FS

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 01150a0..3c09b0a 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -97,6 +97,7 @@ shutdown_facet() {
     facet=$1
     if [ "$FAILURE_MODE" = HARD ]; then
        $POWER_DOWN `facet_active_host $facet`
+       sleep 2 
     elif [ "$FAILURE_MODE" = SOFT ]; then
        stop $facet --force --failover --nomod
     fi
@@ -112,7 +113,7 @@ reboot_facet() {
 wait_for_host() {
    HOST=$1
    check_network  $HOST 900
-   while ! $PDSH $HOST "ls -ld $LUSTRE"; do sleep 5; done
+   while ! $PDSH $HOST "$CHECKSTAT -t dir $LUSTRE"; do sleep 5; done
 }
 
 wait_for() {
@@ -132,7 +133,6 @@ facet_failover() {
     facet=$1
     echo "Failing $facet node `facet_active_host $facet`"
     shutdown_facet $facet
-    sleep 2
     reboot_facet $facet
     client_df &
     DFPID=$!