From ea64279ea0383927ef64eebd0eddfe7c45d0ba4c Mon Sep 17 00:00:00 2001 From: Chris Kirby Date: Wed, 14 Jan 2026 14:36:57 -0600 Subject: [PATCH] Fix trigger firing race in srch-safe-merge-pos Because the srch triggers are inherently async to the test, we can't be sure they won't fire prematurely just because a compact worker started running at an inconvenient time. Make the trigger arming silent to avoid spurious test failures. Move the trigger arming closer to the point of interest to increase the chances that we're actually testing what we want. Signed-off-by: Chris Kirby --- tests/golden/srch-safe-merge-pos | 30 ------------------------------ tests/tests/srch-safe-merge-pos.sh | 11 ++++++----- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/tests/golden/srch-safe-merge-pos b/tests/golden/srch-safe-merge-pos index e801d558..48934d7e 100644 --- a/tests/golden/srch-safe-merge-pos +++ b/tests/golden/srch-safe-merge-pos @@ -1,37 +1,7 @@ == initialize per-mount values == arm compaction triggers -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_merge_stop_safe armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_merge_stop_safe armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_merge_stop_safe armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_merge_stop_safe armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_merge_stop_safe armed: 1 == compact more often == create padded sorted inputs by forcing log rotation -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_force_log_rotate armed: 1 -trigger srch_compact_logs_pad_safe armed: 1 == compaction of padded should stop at safe == verify no compaction errors == cleanup diff --git a/tests/tests/srch-safe-merge-pos.sh b/tests/tests/srch-safe-merge-pos.sh index bd388a18..b5cd340c 100644 --- a/tests/tests/srch-safe-merge-pos.sh +++ b/tests/tests/srch-safe-merge-pos.sh @@ -31,8 +31,8 @@ trap restore_compact_delay EXIT echo "== arm compaction triggers" for nr in $(t_fs_nrs); do - t_trigger_arm srch_compact_logs_pad_safe $nr - t_trigger_arm srch_merge_stop_safe $nr + t_trigger_arm_silent srch_compact_logs_pad_safe $nr + t_trigger_arm_silent srch_merge_stop_safe $nr done echo "== compact more often" @@ -44,11 +44,12 @@ echo "== create padded sorted inputs by forcing log rotation" sv=$(t_server_nr) for i in $(seq 1 $COMPACT_NR); do for j in $(seq 1 $COMPACT_NR); do - t_trigger_arm srch_force_log_rotate $sv - seq -f "f-$i-$j-$SEQF" 1 10 | \ bulk_create_paths -X "scoutfs.srch.t-srch-safe-merge-pos" -d "$T_D0" > \ /dev/null + + t_trigger_arm_silent srch_force_log_rotate $sv + sync test "$(t_trigger_get srch_force_log_rotate $sv)" == "0" || \ @@ -59,7 +60,7 @@ for i in $(seq 1 $COMPACT_NR); do while test $padded == 0 && sleep .5; do for nr in $(t_fs_nrs); do if [ "$(t_trigger_get srch_compact_logs_pad_safe $nr)" == "0" ]; then - t_trigger_arm srch_compact_logs_pad_safe $nr + t_trigger_arm_silent srch_compact_logs_pad_safe $nr padded=1 break fi