diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index ffa2186d29199d71858f5821049ff33c5d54c679..8d38be6f6cb89b8f246d31fbd8efade44b15aee9 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -13,6 +13,13 @@ CLEANUP=${CLEANUP:-""} MOUNT_2=${MOUNT_2:-"yes"} . $LUSTRE/tests/test-framework.sh +if [ "$FAILURE_MODE" = "HARD" ] && mixed_ost_devs; then + CONFIG_EXCEPTIONS="17" + 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" +fi + init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index c8a8cb51f92691a23016ce83041cea2b8ab9845c..b8b5c3485a5279290f62ce77ce818ffb41dc58eb 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -20,6 +20,13 @@ GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""} # bug number: ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT" +if [ "$FAILURE_MODE" = "HARD" ] && mixed_ost_devs; then + CONFIG_EXCEPTIONS="0b 42 47 61a 61c" + 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" +fi + # 63 min 7 min AT AT AT AT" [ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 6 12 16 44a 44b 65 66 67 68"