init_test_env $@
. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
#
ALWAYS_EXCEPT="10 $INSANITY_EXCEPT"
if [ "$FAILURE_MODE" = "HARD" ]; then
- mixed_ost_devs && CONFIG_EXCEPTIONS="0 2 4 5 6 8" && \
- echo -n "Several ost services on one ost node are used with FAILURE_MODE=$FAILURE_MODE. " && \
- echo "Except the tests: $CONFIG_EXCEPTIONS" && \
- ALWAYS_EXCEPT="$ALWAYS_EXCEPT $CONFIG_EXCEPTIONS"
+ skip_env "$0: is not functional with FAILURE_MODE = HARD, please use recovery-double-scale, bz20407"
+ exit 0
fi
#
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
+require_dsh_mds || exit 0
+require_dsh_ost || exit 0
# FAIL_CLIENTS list should not contain the LIVE_CLIENT
FAIL_CLIENTS=$(echo " $FAIL_CLIENTS " | sed -re "s/\s+$LIVE_CLIENT\s+/ /g")
echo "Reintegrating OST"
reboot_facet ost1
- wait_for ost1
+ wait_for_facet ost1
start_ost 1 || return 2
- wait_for $SINGLEMDS
+ wait_for_facet $SINGLEMDS
start $SINGLEMDS `mdsdevname 1` $MDS_MOUNT_OPTS || return $?
#Check FS
#Reintegration
echo "Reintegrating OST"
reboot_facet ost1
- wait_for ost1
+ wait_for_facet ost1
start_ost 1
-
- wait_for $SINGLEMDS
+
+ wait_for_facet $SINGLEMDS
start $SINGLEMDS `mdsdevname 1` $MDS_MOUNT_OPTS
#Check FS
#Reintegration
echo "Reintegrating OSTs"
- wait_for ost1
+ wait_for_facet ost1
start_ost 1
- wait_for ost2
+ wait_for_facet ost2
start_ost 2
clients_recover_osts ost1
#Reintegration
echo "Reintegrating OST/CLIENTs"
- wait_for ost1
+ wait_for_facet ost1
start_ost 1
reintegrate_clients || return 1
sleep 5
- wait_remote_prog df $((TIMEOUT * 3 + 20))
+ wait_remote_prog "stat -f" $((TIMEOUT * 3 + 20))
wait $DFPIDA
wait $DFPIDB
#Reintegration
echo "Reintegrating CLIENTs/OST"
reintegrate_clients || return 3
- wait_for ost1
+ wait_for_facet ost1
start_ost 1
wait $DFPID
clients_up || return 1