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
b=17634
[fs/lustre-release.git]
/
lustre
/
tests
/
insanity.sh
diff --git
a/lustre/tests/insanity.sh
b/lustre/tests/insanity.sh
index
f4b7754
..
3c4bf29
100755
(executable)
--- a/
lustre/tests/insanity.sh
+++ b/
lustre/tests/insanity.sh
@@
-35,9
+35,11
@@
assert_env mds_HOST MDS_MKFS_OPTS
assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
assert_env LIVE_CLIENT FSNAME
assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
assert_env LIVE_CLIENT FSNAME
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
-#
This can be a regexp, to allow more clients
-CLIENTS=${CLIENTS:-"`comma_list $LIVE_CLIENT $FAIL_CLIENTS`"}
+#
FAIL_CLIENTS list should not contain the LIVE_CLIENT
+FAIL_CLIENTS=$(echo " $FAIL_CLIENTS " | sed -re "s/\s+$LIVE_CLIENT\s+/ /g")
DIR=${DIR:-$MOUNT}
DIR=${DIR:-$MOUNT}
@@
-71,13
+73,6
@@
shutdown_client() {
fi
}
fi
}
-reboot_node() {
- NODE=$1
- if [ "$FAILURE_MODE" = HARD ]; then
- $POWER_UP $NODE
- fi
-}
-
fail_clients() {
num=$1
fail_clients() {
num=$1
@@
-103,7
+98,7
@@
fail_clients() {
echo "down clients: $DOWN_CLIENTS"
for client in $DOWN_CLIENTS; do
echo "down clients: $DOWN_CLIENTS"
for client in $DOWN_CLIENTS; do
-
re
boot_node $client
+ boot_node $client
done
DOWN_NUM=`echo $DOWN_CLIENTS | wc -w`
client_rmdirs
done
DOWN_NUM=`echo $DOWN_CLIENTS | wc -w`
client_rmdirs
@@
-160,7
+155,7
@@
clients_recover_osts() {
# do_node $CLIENTS "$LCTL "'--device %OSC_`hostname`_'"${facet}_svc_MNT_client_facet recover"
}
# do_node $CLIENTS "$LCTL "'--device %OSC_`hostname`_'"${facet}_svc_MNT_client_facet recover"
}
-c
leanup
_and_setup_lustre
+c
heck
_and_setup_lustre
# 9 Different Failure Modes Combinations
echo "Starting Test 17 at `date`"
# 9 Different Failure Modes Combinations
echo "Starting Test 17 at `date`"
@@
-371,6
+366,7
@@
test_6() {
echo "Test Lustre stability after OST failure"
client_df &
DFPIDA=$!
echo "Test Lustre stability after OST failure"
client_df &
DFPIDA=$!
+ echo DFPIDA=$DFPIDA
sleep 5
#CLIENT Portion
sleep 5
#CLIENT Portion
@@
-381,17
+377,20
@@
test_6() {
echo "Test Lustre stability after CLIENTs failure"
client_df &
DFPIDB=$!
echo "Test Lustre stability after CLIENTs failure"
client_df &
DFPIDB=$!
+ echo DFPIDB=$DFPIDB
sleep 5
#Reintegration
echo "Reintegrating OST/CLIENTs"
wait_for ost1
start_ost 1
sleep 5
#Reintegration
echo "Reintegrating OST/CLIENTs"
wait_for ost1
start_ost 1
- reintegrate_clients
+ reintegrate_clients
|| return 1
sleep 5
sleep 5
+ wait_remote_prog df $((TIMEOUT * 3 + 10))
wait $DFPIDA
wait $DFPIDB
wait $DFPIDA
wait $DFPIDB
+
echo "Verifying mount"
[ -z "$(mounted_lustre_filesystems)" ] && return 3
client_df
echo "Verifying mount"
[ -z "$(mounted_lustre_filesystems)" ] && return 3
client_df