diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index 49cad57938bab04db4f6e48f4c313825237d90e1..4482716fa9bcae99e02b3e392cbe3a272b7883e4 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 7551bb912860b0a3d4796eb0c82dab71a24f3f13..cff0f7d9f332746658bf3cfa15db4b1aa19fd1e7 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -21,6 +21,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"