Commit 7640e3fc authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Jim Harris
Browse files

test: remove unnecessary RPC address setting 



Since most of the apps no longer attempt to start RPC server by default,
we no longer need to assign unique addresses.

Change-Id: I714e30268141efef6f9117d3d4e6dab04d4fdc50
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22635


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 26d44a12

test/ftl/dirty_shutdown.sh

+2 −2
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ $rpc_py nbd_start_disk ftl0 /dev/nbd0 
waitfornbd nbd0



# Write and calculate checksum of the data written

$spdk_dd -m 0x2 -r /var/tmp/spdk_dd.sock --if=/dev/urandom --of=$testdir/testfile --bs=$block_size --count=$data_size

$spdk_dd -m 0x2 --if=/dev/urandom --of=$testdir/testfile --bs=$block_size --count=$data_size

md5sum $testdir/testfile > $testdir/testfile.md5

$spdk_dd -m 0x2 -r /var/tmp/spdk_dd.sock --if=$testdir/testfile --of=/dev/nbd0 --bs=$block_size --count=$data_size --oflag=direct

$spdk_dd -m 0x2 --if=$testdir/testfile --of=/dev/nbd0 --bs=$block_size --count=$data_size --oflag=direct

sync /dev/nbd0

$rpc_py nbd_stop_disk /dev/nbd0

$rpc_py bdev_ftl_unload -b ftl0

test/fuzz/autofuzz_nvmf.sh

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0 
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



# Note that we chose a consistent seed to ensure that this test is consistent in nightly builds.

$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0xF0 -r "/var/tmp/nvme_fuzz" -t $TEST_TIMEOUT -F "$trid" -N -a 2> $output_dir/nvmf_autofuzz_logs.txt

$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0xF0 -t $TEST_TIMEOUT -F "$trid" -N -a 2> $output_dir/nvmf_autofuzz_logs.txt



$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1

test/fuzz/llvm/nvmf/run.sh

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ function start_llvm_fuzz() { 
		-c $nvmf_cfg \

		-t $timen \

		-D $corpus_dir \

		-Z $fuzzer_type \

		-r /var/tmp/spdk$fuzzer_type.sock

		-Z $fuzzer_type



	rm -rf $nvmf_cfg

}

test/nvmf/host/dma.sh

+4 −4
Original line number Diff line number Diff line
@@ -101,19 +101,19 @@ $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode$subsystem -t $TEST 


# test memory translation

# test_dma doesn't use RPC, but we change the sock path since nvmf target is already using the default RPC sock

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randrw -M 70 -t 5 -m 0xc --json <(gen_nvmf_target_json $subsystem) -b "Nvme${subsystem}n1" -f -x translate -r /var/tmp/dma.sock

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randrw -M 70 -t 5 -m 0xc --json <(gen_nvmf_target_json $subsystem) -b "Nvme${subsystem}n1" -f -x translate



# test data pull/push with split against local malloc

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randrw -M 70 -t 5 -m 0xc --json <(gen_malloc_json) -b "Malloc0" -x pull_push -r /var/tmp/dma.sock

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randrw -M 70 -t 5 -m 0xc --json <(gen_malloc_json) -b "Malloc0" -x pull_push



# test memzero with logical volumes. All clusters are unallocated, read should trigger memzero

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randread -M 70 -t 5 -m 0xc --json <(gen_lvol_nvme_json $subsystem) -b "lvs${subsystem}/lvol${subsystem}" -f -x memzero -r /var/tmp/dma.sock

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randread -M 70 -t 5 -m 0xc --json <(gen_lvol_nvme_json $subsystem) -b "lvs${subsystem}/lvol${subsystem}" -f -x memzero



# clear blob metadata

$rootdir/build/bin/spdk_nvme_perf -q 16 -o 4096 -w write -t 1 -r "trtype:$TEST_TRANSPORT adrfam:IPV4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT"



# test memory translation with logical volumes

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randrw -M 70 -t 5 -m 0xc --json <(gen_lvol_nvme_json $subsystem) -b "lvs${subsystem}/lvol${subsystem}" -f -x translate -r /var/tmp/dma.sock

"$rootdir/test/dma/test_dma/test_dma" -q 16 -o 4096 -w randrw -M 70 -t 5 -m 0xc --json <(gen_lvol_nvme_json $subsystem) -b "lvs${subsystem}/lvol${subsystem}" -f -x translate



trap - SIGINT SIGTERM EXIT

test/nvmf/target/fabrics_fuzz.sh

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPOR 
trid="trtype:$TEST_TRANSPORT adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode1 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT"



# Note that we chose a consistent seed to ensure that this test is consistent in nightly builds.

$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0x2 -r "/var/tmp/nvme_fuzz" -t 30 -S 123456 -F "$trid" -N -a 2> $output_dir/nvmf_fuzz_logs1.txt

$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0x2 -t 30 -S 123456 -F "$trid" -N -a 2> $output_dir/nvmf_fuzz_logs1.txt

# We don't specify a seed for this test. Instead we run a static list of commands from example.json.

$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0x2 -r "/var/tmp/nvme_fuzz" -F "$trid" -j $rootdir/test/app/fuzz/nvme_fuzz/example.json -a 2> $output_dir/nvmf_fuzz_logs2.txt

$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0x2 -F "$trid" -j $rootdir/test/app/fuzz/nvme_fuzz/example.json -a 2> $output_dir/nvmf_fuzz_logs2.txt



$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1