From 5fb5e91e68551515326864e997c9c525c9394389 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Fri, 16 Dec 2022 12:24:59 +0100 Subject: [PATCH] test/common: reduce waitforserial sleep NVMe-oF initiator in recent kernel versions takes considerably less time than when the "sleep 4" was introduced, as described in: https://github.com/spdk/spdk/issues/2467 This effectively reverts: dacd8ec827fd98d3a8e67a922d7ea128ba61f2f7 Change-Id: Ib678d99c330c739788a5d6aaeabd23cb2c9017ef Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15989 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Michal Berger Reviewed-by: Tomasz Zawadzki --- test/common/autotest_common.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index c986f2d7b..708b7aa67 100755 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -1136,11 +1136,8 @@ function waitforserial() { nvme_device_counter=$2 fi - # Wait initially for min 4s to make sure all devices are ready for use. It seems - # that we may be racing with a kernel where in some cases immediate disconnect may - # leave dangling subsystem with no-op block devices which can't be used nor removed - # (unless kernel is rebooted) and which start to negatively affect all the tests. - sleep 4 + # Wait initially for min 2s to make sure all devices are ready for use. + sleep 2 while ((i++ <= 15)); do nvme_devices=$(lsblk -l -o NAME,SERIAL | grep -c "$1") ((nvme_devices == nvme_device_counter)) && return 0