Skip to content

Commit c4552cd

Browse files
yizhanglinuxkawasaki
authored andcommitted
nvme/{003,041,044,052,057,058,060,062}: update arg for _nvme_connect_subsys
The previous patch changed the default behavior of _nvme_connect_subsys to wait for the namespace ready, but we have some cases that don't need to wait for the controller or namespace ready, so add --no-wait-ns/--no-wait for these cases Signed-off-by: Yi Zhang <[email protected]> Reviewed-by: Daniel Wagner <[email protected]> Reviewed-by: Chaitanya Kulkarni <[email protected]> Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
1 parent c21e294 commit c4552cd

8 files changed

Lines changed: 9 additions & 9 deletions

File tree

tests/nvme/003

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test() {
2828

2929
_nvmet_target_setup
3030

31-
_nvme_connect_subsys --port none \
31+
_nvme_connect_subsys --port none --no-wait-ns \
3232
--subsysnqn "nqn.2014-08.org.nvmexpress.discovery"
3333

3434
# This is ugly but checking for the absence of error messages is ...

tests/nvme/041

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ test() {
4141

4242
# Test unauthenticated connection (should fail)
4343
echo "Test unauthenticated connection (should fail)"
44-
_nvme_connect_subsys
44+
_nvme_connect_subsys --no-wait
4545

4646
_nvme_disconnect_subsys
4747

tests/nvme/044

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test() {
6060
# and invalid ctrl authentication
6161
echo "Test invalid ctrl authentication (should fail)"
6262
_nvme_connect_subsys --dhchap-secret "${hostkey}" \
63-
--dhchap-ctrl-secret "${hostkey}"
63+
--dhchap-ctrl-secret "${hostkey}" --no-wait
6464

6565
_nvme_disconnect_subsys
6666

@@ -77,7 +77,7 @@ test() {
7777
echo "Test invalid ctrl key (should fail)"
7878
invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:"
7979
_nvme_connect_subsys --dhchap-secret "${hostkey}" \
80-
--dhchap-ctrl-secret "${invkey}"
80+
--dhchap-ctrl-secret "${invkey}" --no-wait
8181

8282
_nvme_disconnect_subsys
8383

tests/nvme/052

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test() {
3030

3131
_nvmet_target_setup --blkdev none
3232

33-
_nvme_connect_subsys
33+
_nvme_connect_subsys --no-wait-ns
3434

3535
for ((i = 1; i <= iterations; i++)); do
3636
nsid=$((def_nsid + i - 1))

tests/nvme/057

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ test() {
6565
failback "${ports[@]}"
6666

6767
for port in "${ports[@]}"; do
68-
_nvme_connect_subsys --port "${port}"
68+
_nvme_connect_subsys --port "${port}" --no-wait-ns
6969
done
7070

7171
# start fio job

tests/nvme/058

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ test() {
8181
_setup_ana "${ports[@]}"
8282

8383
for port in "${ports[@]}"; do
84-
_nvme_connect_subsys --port "${port}"
84+
_nvme_connect_subsys --port "${port}" --no-wait-ns
8585
done
8686

8787
# Simulate unmap on one cluster node and remap to anther one

tests/nvme/060

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ test() {
5151
# The target reset is triggered with an even number timeout, while the
5252
# host reconnects with an odd number timeout.
5353
for ((i = 0; i <= 5; i++)); do
54-
_nvme_connect_subsys --keep-alive-tmo 1 --reconnect-delay 1
54+
_nvme_connect_subsys --keep-alive-tmo 1 --reconnect-delay 1 --no-wait-ns
5555
sleep 3
5656
_nvme_disconnect_subsys >> "$FULL" 2>&1
5757
done

tests/nvme/062

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ test() {
7272

7373
# Test unencrypted connection
7474
echo "Test unencrypted connection w/ tls required (should fail)"
75-
_nvme_connect_subsys
75+
_nvme_connect_subsys --no-wait
7676

7777
_nvme_disconnect_subsys
7878

0 commit comments

Comments
 (0)