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=22688 Make sure we don't use statfs data from cache.
[fs/lustre-release.git]
/
lustre
/
tests
/
recovery-double-scale.sh
diff --git
a/lustre/tests/recovery-double-scale.sh
b/lustre/tests/recovery-double-scale.sh
index
1f84f92
..
3a8e203
100644
(file)
--- a/
lustre/tests/recovery-double-scale.sh
+++ b/
lustre/tests/recovery-double-scale.sh
@@
-80,7
+80,7
@@
reboot_recover_node () {
boot_node $c
echo "Reintegrating $c"
# one client fails; need dk logs from this client only
boot_node $c
echo "Reintegrating $c"
# one client fails; need dk logs from this client only
- zconf_mount $c $MOUNT || NODES="$c $(
mdts_node
s) $(osts_nodes)" error_exit "zconf_mount failed"
+ zconf_mount $c $MOUNT || NODES="$c $(
facet_host md
s) $(osts_nodes)" error_exit "zconf_mount failed"
done
start_client_loads $item
;;
done
start_client_loads $item
;;
@@
-236,7
+236,7
@@
Status: $result: rc=$rc"
local failedclients=$(cat $END_RUN_FILE | grep -v $0)
# FIXME: need ostfailover-s nodes also for FLAVOR=OST
local product=$(gather_logs $(comma_list $(osts_nodes) \
local failedclients=$(cat $END_RUN_FILE | grep -v $0)
# FIXME: need ostfailover-s nodes also for FLAVOR=OST
local product=$(gather_logs $(comma_list $(osts_nodes) \
- $
(mdts_nodes)
$mdsfailover_HOST $failedclients))
+ $
mds_HOST
$mdsfailover_HOST $failedclients))
echo logs files $product
fi
echo logs files $product
fi
@@
-266,12
+266,8
@@
FAILOVER_PERIOD=${FAILOVER_PERIOD:-$((60*5))} # 5 minutes
# Start client loads.
start_client_loads $NODES_TO_USE
echo clients load pids:
# Start client loads.
start_client_loads $NODES_TO_USE
echo clients load pids:
-if ! do_nodes $NODES_TO_USE "set -x; echo \$(hostname): && cat $TMP/client-load.pid"; then
- if [ -e $DEBUGLOG ]; then
- exec 2<&-
- cat $DEBUGLOG
+if ! do_nodesv $NODES_TO_USE "cat $TMP/client-load.pid"; then
exit 3
exit 3
- fi
fi
# FIXME: Do we want to have an initial sleep period where the clients
fi
# FIXME: Do we want to have an initial sleep period where the clients
@@
-287,12
+283,7
@@
failover_pair MDS clients "test 2: failover MDS, then 2 clients ===="
sleep $FAILOVER_PERIOD
#CMD_TEST_NUM=17.3
sleep $FAILOVER_PERIOD
#CMD_TEST_NUM=17.3
-if [ $MDSCOUNT -gt 1 ]; then
- failover_pair MDS MDS "test 3: failover MDS, then another MDS =="
- sleep $FAILOVER_PERIOD
-else
- skip "$0 : $MDSCOUNT < 2 MDTs, test 3 skipped"
-fi
+# No test 3 for 1.8.x lustre version
#CMD_TEST_NUM=17.4
if [ $OSTCOUNT -gt 1 ]; then
#CMD_TEST_NUM=17.4
if [ $OSTCOUNT -gt 1 ]; then