From 9320b42e53bc547ca514989f467ef6d23e9b0614 Mon Sep 17 00:00:00 2001 From: SqlRush Date: Sat, 11 Jul 2026 06:46:54 +0800 Subject: [PATCH] test(cluster): sweep the two remaining cr-category count baselines to 71 The spec-7.3 merge recomputed the cr dump-category count to 71 (main's 70 + the lane's cr_server_fence_refused_count row) and updated the three files that CONFLICTED (t/215/216/300) -- but t/306 and t/311 assert the same fact, auto-merged clean carrying main's 70, and only run in nightly (caught by run 29127607103; the L462 lesson verbatim: sweep every file asserting the same fact, not just the conflicted set). Verified locally: t/306 29/29, t/311 27/27. Spec: spec-7.3-lms-worker-pool.md --- src/test/cluster_tap/t/306_cluster_5_53_cr_key_reuse.pl | 2 +- src/test/cluster_tap/t/311_cluster_5_56_cr_lifecycle.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/cluster_tap/t/306_cluster_5_53_cr_key_reuse.pl b/src/test/cluster_tap/t/306_cluster_5_53_cr_key_reuse.pl index eb92c44d21..255a7fecbe 100644 --- a/src/test/cluster_tap/t/306_cluster_5_53_cr_key_reuse.pl +++ b/src/test/cluster_tap/t/306_cluster_5_53_cr_key_reuse.pl @@ -106,7 +106,7 @@ # spec-6.12b six CR-server counters. is( $node->safe_psql('postgres', q{SELECT count(*) FROM pg_cluster_state WHERE category='cr'}), - '70', 'L1b cr category has 70 rows (17 + 5 spec-5.53 + 8 spec-5.54 + 5 spec-5.56 + 6 spec-6.12b + 16 spec-6.12i/6.15 + 13 spec-7.1 D0/D3-b census & multi-verdict serve)'); + '71', 'L1b cr category has 71 rows (+ 1 spec-7.3 D7 fence_refused; 17 + 5 spec-5.53 + 8 spec-5.54 + 5 spec-5.56 + 6 spec-6.12b + 16 spec-6.12i/6.15 + 13 spec-7.1 D0/D3-b census & multi-verdict serve)'); for my $k (qw(cr_key_mismatch_count cr_epoch_mismatch_count cr_generation_mismatch_count cr_base_lsn_mismatch_count diff --git a/src/test/cluster_tap/t/311_cluster_5_56_cr_lifecycle.pl b/src/test/cluster_tap/t/311_cluster_5_56_cr_lifecycle.pl index e4b2ef1445..fcbf8f059e 100644 --- a/src/test/cluster_tap/t/311_cluster_5_56_cr_lifecycle.pl +++ b/src/test/cluster_tap/t/311_cluster_5_56_cr_lifecycle.pl @@ -106,7 +106,7 @@ 'postmaster', 'L7b rel_generation_slots is PGC_POSTMASTER'); is( $node->safe_psql('postgres', q{SELECT count(*) FROM pg_cluster_state WHERE category='cr'}), - '70', 'L7c cr category has 70 rows (22 + 8 spec-5.54 tuple + 5 spec-5.56 lifecycle + 6 spec-6.12b cr-server + 16 spec-6.12i/6.15 runtime-visibility & verdict + 13 spec-7.1 D0/D3-b census & multi-verdict serve)'); + '71', 'L7c cr category has 71 rows (+ 1 spec-7.3 D7 fence_refused; 22 + 8 spec-5.54 tuple + 5 spec-5.56 lifecycle + 6 spec-6.12b cr-server + 16 spec-6.12i/6.15 runtime-visibility & verdict + 13 spec-7.1 D0/D3-b census & multi-verdict serve)'); for my $k ( qw(cr_global_epoch_fallback_bump_count cr_rel_gen_bump_count cr_rel_gen_table_overflow_count cr_retention_horizon_advance_noted_count