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
LU-657 test: limit the write size in run_dd
[fs/lustre-release.git]
/
lustre
/
tests
/
replay-vbr.sh
diff --git
a/lustre/tests/replay-vbr.sh
b/lustre/tests/replay-vbr.sh
index
ae7e5c8
..
14c9883
100644
(file)
--- a/
lustre/tests/replay-vbr.sh
+++ b/
lustre/tests/replay-vbr.sh
@@
-58,7
+58,7
@@
rmultiop_start() {
# /tmp/multiop_bg.pid file
local pid_file=$TMP/multiop_bg.pid.$$
# /tmp/multiop_bg.pid file
local pid_file=$TMP/multiop_bg.pid.$$
- do_node $client "MULTIOP_PID_FILE=$pid_file LUSTRE=
sh
runmultiop_bg_pause $file $cmds" &
+ do_node $client "MULTIOP_PID_FILE=$pid_file LUSTRE= runmultiop_bg_pause $file $cmds" &
local pid=$!
sleep 3
local multiop_pid
local pid=$!
sleep 3
local multiop_pid
@@
-146,7
+146,7
@@
test_1b() { # former test_0b
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
-
error
"open succeeded unexpectedly"
+
error_and_remount
"open succeeded unexpectedly"
fi
}
run_test 1b "open (O_CREAT) checks version of parent"
fi
}
run_test 1b "open (O_CREAT) checks version of parent"
@@
-233,7
+233,7
@@
test_2b() { # former test_0e
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
-
error
"create succeeded unexpectedly"
+
error_and_remount
"create succeeded unexpectedly"
fi
}
run_test 2b "create checks version of parent"
fi
}
run_test 2b "create checks version of parent"
@@
-270,7
+270,7
@@
test_3b() { # former test_0g
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
-
error
"unlink succeeded unexpectedly"
+
error_and_remount
"unlink succeeded unexpectedly"
fi
}
run_test 3b "unlink checks version of parent"
fi
}
run_test 3b "unlink checks version of parent"
@@
-323,7
+323,7
@@
test_4c() { # former test_0j
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -u \\\#$UID $file; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -u \\\#$UID $file; then
-
error
"setattr of UID succeeded unexpectedly"
+
error_and_remount
"setattr of UID succeeded unexpectedly"
fi
}
run_test 4c "setattr of UID checks versions"
fi
}
run_test 4c "setattr of UID checks versions"
@@
-346,7
+346,7
@@
test_4d() { # former test_0k
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -g \\\#$UID $file; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -g \\\#$UID $file; then
-
error
"setattr of GID succeeded unexpectedly"
+
error_and_remount
"setattr of GID succeeded unexpectedly"
fi
}
run_test 4d "setattr of GID checks versions"
fi
}
run_test 4d "setattr of GID checks versions"
@@
-384,7
+384,7
@@
test_4f() { # former test_0m
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -p 0644 $file; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -p 0644 $file; then
-
error
"setattr of permission succeeded unexpectedly"
+
error_and_remount
"setattr of permission succeeded unexpectedly"
fi
}
run_test 4f "setattr of permission checks versions"
fi
}
run_test 4f "setattr of permission checks versions"
@@
-513,7
+513,7
@@
test_4k() { # former test_0r
error "time not changed: pre $mtime_pre, post $mtime_post"
fi
if ! do_node $CLIENT1 $CHECKSTAT -s 1 $file; then
error "time not changed: pre $mtime_pre, post $mtime_post"
fi
if ! do_node $CLIENT1 $CHECKSTAT -s 1 $file; then
-
error
"setattr of size failed"
+
error_and_remount
"setattr of size failed"
fi
mtime=$(do_node $CLIENT1 stat --format=%Y $file)
if (($mtime != $mtime_post)); then
fi
mtime=$(do_node $CLIENT1 stat --format=%Y $file)
if (($mtime != $mtime_post)); then
@@
-562,7
+562,7
@@
test_5b() { # former test_0t
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
-
error
"link should fail"
+
error_and_remount
"link should fail"
fi
}
run_test 5b "link checks version of target parent"
fi
}
run_test 5b "link checks version of target parent"
@@
-585,7
+585,7
@@
test_5c() { # former test_0u
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if ! do_node $CLIENT1 $CHECKSTAT -a $DIR/$tdir/$tfile; then
-
error
"link should fail"
+
error_and_remount
"link should fail"
fi
}
run_test 5c "link checks version of source"
fi
}
run_test 5c "link checks version of source"
@@
-644,7
+644,7
@@
test_6c() { # former test_0x
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if do_node $CLIENT1 $CHECKSTAT -a $DIR/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if do_node $CLIENT1 $CHECKSTAT -a $DIR/$tfile; then
-
error
"rename should fail"
+
error_and_remount
"rename should fail"
fi
}
run_test 6c "rename checks version of source parent"
fi
}
run_test 6c "rename checks version of source parent"
@@
-667,7
+667,7
@@
test_6d() { # former test_0y
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if do_node $CLIENT1 $CHECKSTAT -a $DIR/$tfile; then
client_evicted $CLIENT1 || error "$CLIENT1 not evicted"
if do_node $CLIENT1 $CHECKSTAT -a $DIR/$tfile; then
-
error
"rename should fail"
+
error_and_remount
"rename should fail"
fi
}
run_test 6d "rename checks version of target parent"
fi
}
run_test 6d "rename checks version of target parent"
@@
-1153,6
+1153,6
@@
rm -f $cos_param_file
[ "$CLIENTS" ] && zconf_mount_clients $CLIENTS $DIR
[ "$CLIENTS" ] && zconf_mount_clients $CLIENTS $DIR
-complete $
(basename $0) $
SECONDS
+complete $SECONDS
check_and_cleanup_lustre
exit_status
check_and_cleanup_lustre
exit_status