Commit f6fcba38 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/nvmf: only disable test cases in top-level script 



Some of the tests are skipped when using Soft-RoCE.
Test executed as part of run_test should never
skip a test, as it results in false assumption
that it was executed. See supplemental logs in CI output.

Before this patch bdevperf and srq_overwhelm (if executed),
resulted in misreporting this.

This patch moves all check for Soft-RoCE to top-level
nvmf test script.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I6d8941bbadaca2dbf8ab178e30e87d3786fea94c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3597


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 31d22408

test/nvmf/host/bdevperf.sh

+0 −7
Original line number Diff line number Diff line
@@ -21,13 +21,6 @@ function tgt_init() { 
}



nvmftestinit

# There is an intermittent error relating to this test and Soft-RoCE. for now, just

# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1165

if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, skipping the host bdevperf tests."

	exit 0

fi



tgt_init



"$rootdir/test/bdev/bdevperf/bdevperf" --json <(gen_nvmf_target_json) -q 128 -o 4096 -w verify -t 1

test/nvmf/host/target_disconnect.sh

+4 −10
Original line number Diff line number Diff line
@@ -73,17 +73,11 @@ function nvmf_target_disconnect_tc3() { 
}



nvmftestinit

# There is an intermittent error relating to this test and Soft-RoCE. for now, just

# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1043

if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, skipping the target disconnect tests."

else

run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1

run_test "nvmf_target_disconnect_tc2" nvmf_target_disconnect_tc2

if [ -n "$NVMF_SECOND_TARGET_IP" ]; then

	run_test "nvmf_target_disconnect_tc3" nvmf_target_disconnect_tc3

fi

fi



trap - SIGINT SIGTERM EXIT

nvmftestfini

test/nvmf/nvmf.sh

+17 −5
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then 
	run_test "nvmf_nvme_cli" test/nvmf/target/nvme_cli.sh "${TEST_ARGS[@]}"

fi

run_test "nvmf_lvol" test/nvmf/target/nvmf_lvol.sh "${TEST_ARGS[@]}"

#TODO: disabled due to intermittent failures. Need to triage.

# run_test "nvmf_srq_overwhelm" test/nvmf/target/srq_overwhelm.sh $TEST_ARGS

run_test "nvmf_vhost" test/nvmf/target/nvmf_vhost.sh "${TEST_ARGS[@]}"

run_test "nvmf_bdev_io_wait" test/nvmf/target/bdev_io_wait.sh "${TEST_ARGS[@]}"

run_test "nvmf_create_transport." test/nvmf/target/create_transport.sh "${TEST_ARGS[@]}"
@@ -37,14 +35,20 @@ fi 
run_test "nvmf_nmic" test/nvmf/target/nmic.sh "${TEST_ARGS[@]}"

run_test "nvmf_rpc" test/nvmf/target/rpc.sh "${TEST_ARGS[@]}"

run_test "nvmf_fio" test/nvmf/target/fio.sh "${TEST_ARGS[@]}"

run_test "nvmf_shutdown" test/nvmf/target/shutdown.sh "${TEST_ARGS[@]}"

run_test "nvmf_bdevio" test/nvmf/target/bdevio.sh "${TEST_ARGS[@]}"

run_test "nvmf_invalid" test/nvmf/target/invalid.sh "${TEST_ARGS[@]}"

run_test "nvmf_abort" test/nvmf/target/abort.sh "${TEST_ARGS[@]}"



if ! check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	# Soft-RoCE will return invalid values in the WC field after a qp has been

	# destroyed which lead to NULL pointer references not seen in real hardware.

	run_test "nvmf_shutdown" test/nvmf/target/shutdown.sh "${TEST_ARGS[@]}"

	#TODO: disabled due to intermittent failures. Need to triage.

	# run_test "nvmf_srq_overwhelm" test/nvmf/target/srq_overwhelm.sh $TEST_ARGS

fi



timing_enter host



run_test "nvmf_bdevperf" test/nvmf/host/bdevperf.sh "${TEST_ARGS[@]}"

run_test "nvmf_identify" test/nvmf/host/identify.sh "${TEST_ARGS[@]}"

run_test "nvmf_perf" test/nvmf/host/perf.sh "${TEST_ARGS[@]}"
@@ -52,7 +56,15 @@ run_test "nvmf_perf" test/nvmf/host/perf.sh "${TEST_ARGS[@]}" 
#run_test test/nvmf/host/identify_kernel_nvmf.sh $TEST_ARGS

run_test "nvmf_aer" test/nvmf/host/aer.sh "${TEST_ARGS[@]}"

run_test "nvmf_fio" test/nvmf/host/fio.sh "${TEST_ARGS[@]}"



# There is an intermittent error relating to those tests and Soft-RoCE.

# Skip those tests if we are using rxe.

if ! check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	# GitHub issue #1165

	run_test "nvmf_bdevperf" test/nvmf/host/bdevperf.sh "${TEST_ARGS[@]}"

	# GitHub issue #1043

	run_test "nvmf_target_disconnect" test/nvmf/host/target_disconnect.sh "${TEST_ARGS[@]}"

fi



timing_exit host

test/nvmf/target/shutdown.sh

+0 −8
Original line number Diff line number Diff line
@@ -146,14 +146,6 @@ function nvmf_shutdown_tc3() { 
	stoptarget

}



# The shutdown tests create a lot of edge cases that Soft-RoCE doesn't respond well to.

# Specifically Soft-RoCE will return invalid values in the WC field after a qp has been

# destroyed which lead to NULL pointer references not seen in real hardware.

if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, skipping the shutdown tests."

	exit 0

fi



nvmftestinit



run_test "nvmf_shutdown_tc1" nvmf_shutdown_tc1

test/nvmf/target/srq_overwhelm.sh

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ rpc_py="$rootdir/scripts/rpc.py" 


nvmftestinit



if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, Likely not enough memory to run this test. aborting."

	exit 0

fi



nvmfappstart -m 0xF



# create the rdma transport with an intentionally small SRQ depth