mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
selftests/vsock: speed up tests by reducing the QEMU pidfile timeout
Reduce the time waiting for the QEMU pidfile from three minutes to five seconds. The three minute time window was chosen to make sure QEMU had enough time to fully boot up. This, however, is an unreasonably long delay for QEMU to write the pidfile, which happens earlier when the QEMU process starts (not after VM boot). The three minute delay becomes noticeably wasteful in future tests that expect QEMU to fail and wait a full three minutes for a pidfile that will never exist. Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Link: https://patch.msgid.link/20251108-vsock-selftests-fixes-and-improvements-v4-6-d5e8d6c87289@meta.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
c7df4adc06
commit
9e2ad0bc36
@@ -22,7 +22,7 @@ readonly SSH_HOST_PORT=2222
|
||||
readonly VSOCK_CID=1234
|
||||
readonly WAIT_PERIOD=3
|
||||
readonly WAIT_PERIOD_MAX=60
|
||||
readonly WAIT_TOTAL=$(( WAIT_PERIOD * WAIT_PERIOD_MAX ))
|
||||
readonly WAIT_QEMU=5
|
||||
readonly PIDFILE_TEMPLATE=/tmp/vsock_vmtest_XXXX.pid
|
||||
declare -A PIDFILES
|
||||
|
||||
@@ -236,7 +236,7 @@ vm_start() {
|
||||
--append "${KERNEL_CMDLINE}" \
|
||||
--rw &> ${logfile} &
|
||||
|
||||
timeout "${WAIT_TOTAL}" \
|
||||
timeout "${WAIT_QEMU}" \
|
||||
bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user