b=15747

i=Tappro
test_24 and t-f client_reconnect fn fix

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index a7eaa84..4cb9990 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -591,8 +591,9 @@ test_23() { #b=4561
 }
 run_test 23 "client hang when close a file after mds crash"
 
-test_24() {    # bug 2248 - eviction fails writeback but app doesn't see it
+test_24() { # bug 11710 details correct fsync() behavior
        mkdir -p $DIR/$tdir
+       lfs setstripe $DIR/$tdir -s 0 -i 0 -c 1
        cancel_lru_locks osc
        multiop_bg_pause $DIR/$tdir/$tfile Owy_wyc || return 1
        MULTI_PID=$!

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 3c2e7e8..6547455 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -577,8 +577,10 @@ client_df() {
 
 client_reconnect() {
     uname -n >> $MOUNT/recon
-    if [ ! -z "$CLIENTS" ]; then
-        $PDSH $CLIENTS "df $MOUNT; uname -n >> $MOUNT/recon" > /dev/null
+    if [ -z "$CLIENTS" ]; then
+        df $MOUNT; uname -n >> $MOUNT/recon
+    else
+        do_nodes $CLIENTS "df $MOUNT; uname -n >> $MOUNT/recon" > /dev/null
     fi
     echo Connected clients:
     cat $MOUNT/recon