From 607513e64e48c098bb10740453318e40493e27b7 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 4 Mar 2024 14:48:26 +0100 Subject: [PATCH] nvme/048: make queue count check retry-able We are racing with the reset path of the controller. That means, when we set a new queue count, we might not observe the resetting state in time. Thus, first check if we see the correct queue count and then the controller state. Reviewed-by: Chaitanya Kulkarni Signed-off-by: Daniel Wagner [Shin'ichiro: removed unnecessary if block in nvmf_check_queue_count()] Signed-off-by: Shin'ichiro Kawasaki --- tests/nvme/048 | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/nvme/048 b/tests/nvme/048 index 8c314fae..f76cfedf 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -47,15 +47,24 @@ nvmf_check_queue_count() { local queue_count="$2" local nvmedev local queue_count_file + local retries nvmedev=$(_find_nvme_dev "${subsys_name}") + queue_count=$((queue_count + 1)) + retries=5 + queue_count_file=$(cat /sys/class/nvme-fabrics/ctl/"${nvmedev}"/queue_count) + while [[ "${queue_count}" -ne "${queue_count_file}" ]]; do + if [[ "${retries}" == 0 ]]; then + echo "expected queue count ${queue_count} not set" + return 1 + fi - queue_count=$((queue_count + 1)) - if [[ "${queue_count}" -ne "${queue_count_file}" ]]; then - echo "expected queue count ${queue_count} not set" - return 1 - fi + sleep 1 + + retries=$((retries - 1)) + queue_count_file=$(cat /sys/class/nvme-fabrics/ctl/"${nvmedev}"/queue_count) + done return 0 } @@ -73,8 +82,8 @@ set_qid_max() { local qid_max="$2" set_nvmet_attr_qid_max "${subsys_name}" "${qid_max}" - nvmf_wait_for_state "${subsys_name}" "live" || return 1 nvmf_check_queue_count "${subsys_name}" "${qid_max}" || return 1 + nvmf_wait_for_state "${subsys_name}" "live" || return 1 return 0 }