test/adq: Move nvmfappstart outside of adq_start_nvmf_target
Also rename adq_start_nvmf_target to adq_configure_nvmf_target. Change-Id: I92bf4b7743061543a4d5fcbeaa59d0ff387e1395 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13834 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com> Reviewed-by: Dong Yi <dongx.yi@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
parent
8ebb8e65e7
commit
9a9c9d3303
@ -36,8 +36,7 @@ function adq_configure_driver() {
|
||||
"${NVMF_TARGET_NS_CMD[@]}" $rootdir/scripts/perf/nvmf/set_xps_rxqs $NVMF_TARGET_INTERFACE
|
||||
}
|
||||
|
||||
function adq_start_nvmf_target() {
|
||||
nvmfappstart -m $2 --wait-for-rpc
|
||||
function adq_configure_nvmf_target() {
|
||||
$rpc_py sock_impl_set_options --enable-placement-id $1 --enable-zerocopy-send-server -i posix
|
||||
$rpc_py framework_start_init
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS --io-unit-size 8192 --sock-priority $1
|
||||
@ -64,7 +63,8 @@ adq_reload_driver
|
||||
|
||||
# When ADQ is disabled, we expect 1 connection on each of the 4 poll groups.
|
||||
nvmftestinit
|
||||
adq_start_nvmf_target 0 0xF
|
||||
nvmfappstart -m 0xF --wait-for-rpc
|
||||
adq_configure_nvmf_target 0
|
||||
sleep 2
|
||||
$perf -q 64 -o 4096 -w randread -t 10 -c 0xF0 \
|
||||
-r "trtype:${TEST_TRANSPORT} adrfam:IPv4 traddr:${NVMF_FIRST_TARGET_IP} trsvcid:${NVMF_PORT} \
|
||||
@ -86,7 +86,8 @@ adq_reload_driver
|
||||
nvmftestinit
|
||||
sleep 2
|
||||
adq_configure_driver
|
||||
adq_start_nvmf_target 1 0xF
|
||||
nvmfappstart -m 0xF --wait-for-rpc
|
||||
adq_configure_nvmf_target 1
|
||||
sleep 2
|
||||
$perf -q 64 -o 4096 -w randread -t 10 -c 0xF0 \
|
||||
-r "trtype:${TEST_TRANSPORT} adrfam:IPv4 traddr:${NVMF_FIRST_TARGET_IP} trsvcid:${NVMF_PORT} \
|
||||
|
Loading…
Reference in New Issue
Block a user