From 669e37c63612930651c92d284bec6261f470767f Mon Sep 17 00:00:00 2001 From: Chris Kirby Date: Wed, 18 Jun 2025 13:05:25 -0500 Subject: [PATCH] Remove hung task workaround from large-fragmented-free test Adjusting hung_task_timeout_secs is still needed for this test to pass with a debug kernel. But the logic belongs on the platform side. Signed-off-by: Chris Kirby --- tests/golden/large-fragmented-free | 1 - tests/tests/large-fragmented-free.sh | 24 ------------------------ 2 files changed, 25 deletions(-) diff --git a/tests/golden/large-fragmented-free b/tests/golden/large-fragmented-free index 7740849c..58aea5f7 100644 --- a/tests/golden/large-fragmented-free +++ b/tests/golden/large-fragmented-free @@ -1,4 +1,3 @@ -== setting longer hung task timeout == creating fragmented extents == unlink file with moved extents to free extents per block == cleanup diff --git a/tests/tests/large-fragmented-free.sh b/tests/tests/large-fragmented-free.sh index 33f3bef7..e27d1bbe 100644 --- a/tests/tests/large-fragmented-free.sh +++ b/tests/tests/large-fragmented-free.sh @@ -10,30 +10,6 @@ EXTENTS_PER_BTREE_BLOCK=600 EXTENTS_PER_LIST_BLOCK=8192 FREED_EXTENTS=$((EXTENTS_PER_BTREE_BLOCK * EXTENTS_PER_LIST_BLOCK)) -# -# This test specifically creates a pathologically sparse file that will -# be as expensive as possible to free. This is usually fine on -# dedicated or reasonable hardware, but trying to run this in -# virtualized debug kernels can take a very long time. This test is -# about making sure that the server doesn't fail, not that the platform -# can handle the scale of work that our btree formats happen to require -# while execution is bogged down with use-after-free memory reference -# tracking. So we give the test a lot more breathing room before -# deciding that its hung. -# -echo "== setting longer hung task timeout" -if [ -w /proc/sys/kernel/hung_task_timeout_secs ]; then - secs=$(cat /proc/sys/kernel/hung_task_timeout_secs) - test "$secs" -gt 0 || \ - t_fail "confusing value '$secs' from /proc/sys/kernel/hung_task_timeout_secs" - restore_hung_task_timeout() - { - echo "$secs" > /proc/sys/kernel/hung_task_timeout_secs - } - trap restore_hung_task_timeout EXIT - echo "$((secs * 5))" > /proc/sys/kernel/hung_task_timeout_secs -fi - echo "== creating fragmented extents" fragmented_data_extents $FREED_EXTENTS $EXTENTS_PER_BTREE_BLOCK "$T_D0/alloc" "$T_D0/move"