b=1817 add a replay-single test that uses touch, which triggers 1817.

teach the upcall about different upcall types.

diff --git a/lustre/tests/replay-single-upcall.sh b/lustre/tests/replay-single-upcall.sh
index 8dcda8e..5616551 100755 (executable)
--- a/lustre/tests/replay-single-upcall.sh
+++ b/lustre/tests/replay-single-upcall.sh
@@ -1,4 +1,20 @@
 #!/bin/sh
+
 LUSTRE=`dirname $0`/..
-$LUSTRE/utils/lctl --device %$3 recover ||
-    logger -p kern.info recovery failed: $@
\ No newline at end of file
+
+failed_import() {
+    $LUSTRE/utils/lctl --device %$3 recover ||
+        logger -p kern.info recovery failed: $@
+}
+
+recovery_over() {
+    logger -p kern.info upcall: $@
+}
+
+
+case "$1" in
+FAILED_IMPORT) failed_import $@
+               ;;
+RECOVERY_OVER) recovery_over $@
+               ;;
+esac

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index e6de9f3..c55bd7e 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -162,6 +162,15 @@ test_1() {
 }
 run_test 1 "simple create"
 
+test_1a() {
+    replay_barrier mds
+    touch $DIR/f1
+    fail mds
+    $CHECKSTAT -t file $DIR/f1 || error 
+    rm $DIR/f1
+}
+run_test 1 "touch"
+
 test_2() {
     replay_barrier mds
     mkdir $DIR/d2