b=18080

 r=shadow

 - handle possible hangup while waiting for children processes in test_35;

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 591024d..78bba9a 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -848,11 +848,18 @@ test_35() { # bug 17645
 #define OBD_FAIL_LDLM_INTR_CP_AST        0x317
         do_facet client "lctl set_param fail_loc=0x80000317"
         ls -la $MOUNT1/$tfile > /dev/null &
+        pid1=$!
         sleep 1
         
         # Let's take write lock on same file from another mount. This
         # should cause conflict and bl_ast
         createmany -o $MOUNT2/$tfile/a 2000 &
+        pid2=$!
+        local timeout=`do_facet $SINGLEMDS lctl get_param  -n timeout`
+        let timeout=timeout*3
+        log "Wait for $pid1 $pid2 for $timeout sec..."
+        sleep $timeout
+        kill -9 $pid1 $pid2 > /dev/null 2>&1
         wait
         do_facet client "lctl set_param fail_loc=0x0"
         df -h $MOUNT1 $MOUNT2