Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
tests
/
recovery-small.sh
diff --git
a/lustre/tests/recovery-small.sh
b/lustre/tests/recovery-small.sh
index
b3902d8
..
bae9793
100755
(executable)
--- a/
lustre/tests/recovery-small.sh
+++ b/
lustre/tests/recovery-small.sh
@@
-255,6
+255,11
@@
test_18a() {
# 1 stripe on ost2
lfs setstripe $f -s $((128 * 1024)) -i 1 -c 1
# 1 stripe on ost2
lfs setstripe $f -s $((128 * 1024)) -i 1 -c 1
+ get_stripe_info client $f
+ if [ $stripe_index -ne 1 ]; then
+ lfs getstripe $f
+ error "$f: different stripe offset ($stripe_index)" && return
+ fi
do_facet client cp $SAMPLE_FILE $f
sync
do_facet client cp $SAMPLE_FILE $f
sync
@@
-275,14
+280,17
@@
test_18b() {
do_facet client mkdir -p $DIR/$tdir
f=$DIR/$tdir/$tfile
do_facet client mkdir -p $DIR/$tdir
f=$DIR/$tdir/$tfile
- f2=$DIR/$tdir/${tfile}-2
cancel_lru_locks osc
pgcache_empty || return 1
# shouldn't have to set stripe size of count==1
lfs setstripe $f -s $((128 * 1024)) -i 0 -c 1
cancel_lru_locks osc
pgcache_empty || return 1
# shouldn't have to set stripe size of count==1
lfs setstripe $f -s $((128 * 1024)) -i 0 -c 1
- lfs setstripe $f2 -s $((128 * 1024)) -i 0 -c 1
+ get_stripe_info client $f
+ if [ $stripe_index -ne 0 ]; then
+ lfs getstripe $f
+ error "$f: different stripe offset ($stripe_index)" && return
+ fi
do_facet client cp $SAMPLE_FILE $f
sync
do_facet client cp $SAMPLE_FILE $f
sync
@@
-293,7
+301,7
@@
test_18b() {
# cache after the client reconnects?
rc=0
pgcache_empty || rc=2
# cache after the client reconnects?
rc=0
pgcache_empty || rc=2
- rm -f $f
$f2
+ rm -f $f
return $rc
}
run_test 18b "eviction and reconnect clears page cache (2766)"
return $rc
}
run_test 18b "eviction and reconnect clears page cache (2766)"
@@
-303,14
+311,17
@@
test_18c() {
do_facet client mkdir -p $DIR/$tdir
f=$DIR/$tdir/$tfile
do_facet client mkdir -p $DIR/$tdir
f=$DIR/$tdir/$tfile
- f2=$DIR/$tdir/${tfile}-2
cancel_lru_locks osc
pgcache_empty || return 1
# shouldn't have to set stripe size of count==1
lfs setstripe $f -s $((128 * 1024)) -i 0 -c 1
cancel_lru_locks osc
pgcache_empty || return 1
# shouldn't have to set stripe size of count==1
lfs setstripe $f -s $((128 * 1024)) -i 0 -c 1
- lfs setstripe $f2 -s $((128 * 1024)) -i 0 -c 1
+ get_stripe_info client $f
+ if [ $stripe_index -ne 0 ]; then
+ lfs getstripe $f
+ error "$f: different stripe offset ($stripe_index)" && return
+ fi
do_facet client cp $SAMPLE_FILE $f
sync
do_facet client cp $SAMPLE_FILE $f
sync
@@
-326,7
+337,7
@@
test_18c() {
# cache after the client reconnects?
rc=0
pgcache_empty || rc=2
# cache after the client reconnects?
rc=0
pgcache_empty || rc=2
- rm -f $f
$f2
+ rm -f $f
return $rc
}
run_test 18c "Dropped connect reply after eviction handing (14755)"
return $rc
}
run_test 18c "Dropped connect reply after eviction handing (14755)"