From 461321eac7553644ca202c44aa81ce5724db3566 Mon Sep 17 00:00:00 2001
From: rread <rread>
Date: Tue, 23 Mar 2004 21:02:07 +0000
Subject: [PATCH] b=2973

- add a new test (18a) to use lctl --deactivate to confirm page cache is
  cleared after invalidation.
- rename 18 to 18b, and increase wait to ensure the cache is checked after
  recovery
---
 lustre/tests/recovery-small.sh | 51 ++++++++++++++++++++++++++++--------------
 lustre/tests/test-framework.sh | 12 ++++++++++
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index e688313..af9a6c1 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -237,20 +237,39 @@ test_17() {
 }
 run_test 17 "timeout bulk get, evict client (2732)"
 
-test_18() {
+test_18a() {
+    do_facet client mkdir -p $MOUNT/$tdir
+    f=$MOUNT/$tdir/$tfile
+
+    cancel_lru_locks OSC
+    pgcache_empty || return 1
+
+    # 1 stripe on ost2
+    lfs setstripe $f $((128 * 1024)) 1 1
+
+    do_facet client cp /etc/termcap $f
+    sync
+    local osc2_dev=`$LCTL device_list | \
+	awk '(/ost2.*client_facet/){print $4}' `
+    $LCTL --device %$osc2_dev deactivate
+    # my understanding is that there should be nothing in the page
+    # cache after the client reconnects?     
+    rc=0
+    pgcache_empty || rc=2
+    $LCTL --device %$osc2_dev activate
+    rm -f $f
+    return $rc
+}
+run_test 18a "manual ost invalidate clears page cache immediately"
+
+test_18b() {
 # OBD_FAIL_PTLRPC_BULK_PUT_NET|OBD_FAIL_ONCE
     do_facet client mkdir -p $MOUNT/$tdir
     f=$MOUNT/$tdir/$tfile
     f2=$MOUNT/$tdir/${tfile}-2
 
     cancel_lru_locks OSC
-    for a in /proc/fs/lustre/llite/*/dump_page_cache; do
-        if [ `wc -l $a | awk '{print $1}'` -gt 1 ]; then
-                echo there is still data in page cache $a ?
-                cat $a;
-                return 1;
-        fi
-    done
+    pgcache_empty || return 1
 
     # shouldn't have to set stripe size of count==1
     lfs setstripe $f $((128 * 1024)) 0 1
@@ -264,17 +283,15 @@ test_18() {
     sync
     sysctl -w lustre.fail_loc=0
     # allow recovery to complete
-    sleep 10
+    sleep $((TIMEOUT + 2))
     # my understanding is that there should be nothing in the page
     # cache after the client reconnects?     
-    for a in /proc/fs/lustre/llite/*/dump_page_cache; do
-        if [ `wc -l $a | awk '{print $1}'` -gt 1 ]; then
-                echo there is still data in page cache $a ?
-                cat $a;
-                return 1;
-        fi
-    done
+    rc=0
+    pgcache_empty || rc=2
+    rm -f $f $f2
+    return $rc
 }
-run_test 18 "eviction and reconnect clears page cache (2766)"
+run_test 18b "eviction and reconnect clears page cache (2766)"
+
 
 $CLEANUP
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index a23f6d8..96fa7b5 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -449,6 +449,18 @@ cancel_lru_locks() {
     done
 }
 
+
+pgcache_empty() {
+    for a in /proc/fs/lustre/llite/*/dump_page_cache; do
+        if [ `wc -l $a | awk '{print $1}'` -gt 1 ]; then
+                echo there is still data in page cache $a ?
+                cat $a;
+                return 1;
+        fi
+    done
+    return 0
+}
+
 ##################################
 # Test interface 
 error() {
-- 
1.8.3.1