ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/nvmf: add some delays in discovery.sh

Browse Source 
The test script does sequences like the following:

1) Add a host to an existing subsystem on target A
2) Check application B to see if it has received a
   discovery AEN and attached to that subsystem

But we have to account for some delay between 1 and 2.
Application B has to receive the discovery AEN, get
the discovery log page, parse the new log page entry
and then connect to the NVM subsystem.

Fixes issue #2420.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I160ed117ccd92bfb848f0075494a0d516b341191
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11934
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2022-03-10 13:27:16 +00:00 committed by Tomasz Zawadzki
parent 9d0bd899ed
commit 713333fdc9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/nvmf/host/discovery.sh
View File

@ -92,6 +92,7 @@ get_notification_count
# Discovery hostnqn is added, so now the host should see the subsystem, with a single path for the # Discovery hostnqn is added, so now the host should see the subsystem, with a single path for the
# port of the single listener on the target. # port of the single listener on the target.
$rpc_py nvmf_subsystem_add_host ${NQN}0 $HOST_NQN $rpc_py nvmf_subsystem_add_host ${NQN}0 $HOST_NQN
sleep 1 # Wait a bit to make sure the discovery service has a chance to detect the changes
[[ "$(get_subsystem_names)" == "nvme0" ]] [[ "$(get_subsystem_names)" == "nvme0" ]]
[[ "$(get_bdev_list)" == "nvme0n1" ]] [[ "$(get_bdev_list)" == "nvme0n1" ]]
[[ "$(get_subsystem_paths nvme0)" == "$NVMF_PORT" ]] [[ "$(get_subsystem_paths nvme0)" == "$NVMF_PORT" ]]
@ -100,6 +101,7 @@ get_notification_count
# Adding a namespace isn't a discovery function, but do it here anyways just to confirm we see a new bdev. # Adding a namespace isn't a discovery function, but do it here anyways just to confirm we see a new bdev.
$rpc_py nvmf_subsystem_add_ns ${NQN}0 null1 $rpc_py nvmf_subsystem_add_ns ${NQN}0 null1
sleep 1 # Wait a bit to make sure the discovery service has a chance to detect the changes
[[ "$(get_bdev_list)" == "nvme0n1 nvme0n2" ]] [[ "$(get_bdev_list)" == "nvme0n1 nvme0n2" ]]
get_notification_count get_notification_count
[[ $notification_count == 1 ]] [[ $notification_count == 1 ]]
@ -107,6 +109,7 @@ get_notification_count
# Add a second path to the same subsystem. This shouldn't change the list of subsystems or bdevs, but # Add a second path to the same subsystem. This shouldn't change the list of subsystems or bdevs, but
# we should see a second path on the nvme0 subsystem now. # we should see a second path on the nvme0 subsystem now.
$rpc_py nvmf_subsystem_add_listener ${NQN}0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_SECOND_PORT $rpc_py nvmf_subsystem_add_listener ${NQN}0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_SECOND_PORT
sleep 1 # Wait a bit to make sure the discovery service has a chance to detect the changes
[[ "$(get_subsystem_names)" == "nvme0" ]] [[ "$(get_subsystem_names)" == "nvme0" ]]
[[ "$(get_bdev_list)" == "nvme0n1 nvme0n2" ]] [[ "$(get_bdev_list)" == "nvme0n1 nvme0n2" ]]
[[ "$(get_subsystem_paths nvme0)" == "$NVMF_PORT $NVMF_SECOND_PORT" ]] [[ "$(get_subsystem_paths nvme0)" == "$NVMF_PORT $NVMF_SECOND_PORT" ]]
@ -116,6 +119,7 @@ get_notification_count
# Remove the listener for the first port. The subsystem and bdevs should stay, but we should see # Remove the listener for the first port. The subsystem and bdevs should stay, but we should see
# the path to that first port disappear. # the path to that first port disappear.
$rpc_py nvmf_subsystem_remove_listener ${NQN}0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT $rpc_py nvmf_subsystem_remove_listener ${NQN}0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
sleep 1 # Wait a bit to make sure the discovery service has a chance to detect the changes
[[ "$(get_subsystem_names)" == "nvme0" ]] [[ "$(get_subsystem_names)" == "nvme0" ]]
[[ "$(get_bdev_list)" == "nvme0n1 nvme0n2" ]] [[ "$(get_bdev_list)" == "nvme0n1 nvme0n2" ]]
[[ "$(get_subsystem_paths nvme0)" == "$NVMF_SECOND_PORT" ]] [[ "$(get_subsystem_paths nvme0)" == "$NVMF_SECOND_PORT" ]]
@ -123,6 +127,7 @@ get_notification_count
[[ $notification_count == 0 ]] [[ $notification_count == 0 ]]
$rpc_py -s $HOST_SOCK bdev_nvme_stop_discovery -b nvme $rpc_py -s $HOST_SOCK bdev_nvme_stop_discovery -b nvme
sleep 1 # Wait a bit to make sure the discovery service has a chance to detect the changes
[[ "$(get_subsystem_names)" == "" ]] [[ "$(get_subsystem_names)" == "" ]]
[[ "$(get_bdev_list)" == "" ]] [[ "$(get_bdev_list)" == "" ]]
get_notification_count get_notification_count