From: Darrick J. Wong Date: Tue, 27 Feb 2024 04:41:00 +0000 (-0800) Subject: xfs/155: fail the test if xfs_repair hangs for too long X-Git-Tag: xfs-zoned-2024-06-07~128 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed696778485420b64d001d2d78d03e5ad08bac1f;p=users%2Fhch%2Fxfstests-dev.git xfs/155: fail the test if xfs_repair hangs for too long There are a few hard to reproduce bugs in xfs_repair where it can deadlock trying to lock a buffer that it already owns. These stalls cause fstests never to finish, which is annoying! To fix this, set up the xfs_repair run to abort after 10 minutes, which will affect the golden output and capture a core file. This doesn't fix xfs_repair, obviously. Signed-off-by: "Darrick J. Wong" Reviewed-by: Zorro Lang Reviewed-by: Christoph Hellwig Signed-off-by: Zorro Lang --- diff --git a/tests/xfs/155 b/tests/xfs/155 index 302607b51..8bf1aba1f 100755 --- a/tests/xfs/155 +++ b/tests/xfs/155 @@ -26,6 +26,11 @@ _require_scratch_nocheck _require_scratch_xfs_crc # needsrepair only exists for v5 _require_populate_commands _require_libxfs_debug_flag LIBXFS_DEBUG_WRITE_CRASH +_require_command "$TIMEOUT_PROG" timeout + +# Inject a 10 minute abortive timeout on the repair program so that deadlocks +# in the program do not cause fstests to hang indefinitely. +XFS_REPAIR_PROG="$TIMEOUT_PROG -s ABRT 10m $XFS_REPAIR_PROG" # Populate the filesystem _scratch_populate_cached nofill >> $seqres.full 2>&1