Skip to content

Commit 56a08b8

Browse files
Ming Leiaxboe
authored andcommitted
selftests: ublk: increase timeouts for parallel test execution
When running tests in parallel with high JOBS count (e.g., JOBS=64), the existing timeouts can be insufficient due to system load: - Increase state wait loops from 20/50 to 100 iterations in _recover_ublk_dev(), __ublk_quiesce_dev(), and __ublk_kill_daemon() to handle slower state transitions under heavy load - Add --timeout=20 to udevadm settle calls to prevent indefinite hangs when udev event queue is overwhelmed by rapid device creation/deletion Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 64406dd commit 56a08b8

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

tools/testing/selftests/ublk/test_common.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ _create_ublk_dev() {
216216
fi
217217

218218
if [ "$settle" = "yes" ]; then
219-
udevadm settle
219+
udevadm settle --timeout=20
220220
fi
221221

222222
if [[ "$dev_id" =~ ^[0-9]+$ ]]; then
@@ -240,7 +240,7 @@ _recover_ublk_dev() {
240240
local state
241241

242242
dev_id=$(_create_ublk_dev "recover" "yes" "$@")
243-
for ((j=0;j<20;j++)); do
243+
for ((j=0;j<100;j++)); do
244244
state=$(_get_ublk_dev_state "${dev_id}")
245245
[ "$state" == "LIVE" ] && break
246246
sleep 1
@@ -260,7 +260,7 @@ __ublk_quiesce_dev()
260260
return "$state"
261261
fi
262262

263-
for ((j=0;j<50;j++)); do
263+
for ((j=0;j<100;j++)); do
264264
state=$(_get_ublk_dev_state "${dev_id}")
265265
[ "$state" == "$exp_state" ] && break
266266
sleep 1
@@ -279,7 +279,7 @@ __ublk_kill_daemon()
279279
daemon_pid=$(_get_ublk_daemon_pid "${dev_id}")
280280
state=$(_get_ublk_dev_state "${dev_id}")
281281

282-
for ((j=0;j<50;j++)); do
282+
for ((j=0;j<100;j++)); do
283283
[ "$state" == "$exp_state" ] && break
284284
kill -9 "$daemon_pid" > /dev/null 2>&1
285285
sleep 1
@@ -304,7 +304,7 @@ __remove_ublk_dev_return() {
304304

305305
_ublk_del_dev "${dev_id}"
306306
local res=$?
307-
udevadm settle
307+
udevadm settle --timeout=20
308308
return ${res}
309309
}
310310

0 commit comments

Comments
 (0)