Skip to content

Commit 589409c

Browse files
author
SqlRush
committed
test(cluster): refresh grd dump baselines surfaced by nightly
The same S-reconfig nightly that pinned the join-fence wedge also flagged two stale dump-count baselines that lagged already-shipped counters: * t/108 pg_cluster_state pcm category 22 -> 23 (spec-4.6a D12 dead_cleanup_entries). * t/249 grd_recovery dump roster 18 -> 31 keys plus the exact sorted key list (spec-4.6 2.4 base + spec-5.16 D5 join direction + spec-4.6a liveness/episode surface). Both stay exact-count / exact-roster assertions; the code already emits the 31-key grd_recovery set (verified against cluster_debug.c). Spec: spec-4.6a-grd-recovery-liveness.md
1 parent 152b579 commit 589409c

2 files changed

Lines changed: 22 additions & 14 deletions

File tree

src/test/cluster_tap/t/108_pcm_state_machine.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
my $pcm_category_rows = $node_default->safe_psql(
4949
'postgres',
5050
"SELECT count(*) FROM pg_cluster_state WHERE category = 'pcm'");
51-
is($pcm_category_rows, '22',
52-
'L1 pg_cluster_state pcm category has 22 rows (spec-2.30 D9 surface + spec-6.14a D5 + spec-6.14 D5 KO-aux-defer counter)');
51+
is($pcm_category_rows, '23',
52+
'L1 pg_cluster_state pcm category has 23 rows (spec-2.30 D9 surface + spec-6.14a D5 + spec-6.14 D5 KO-aux-defer counter + spec-4.6a D12 dead_cleanup_entries)');
5353

5454
# L3 — api_state shows "active" when GUC=-1 default
5555
my $api_state_default = $node_default->safe_psql(

src/test/cluster_tap/t/249_grd_recovery_remaster.pl

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@
4141
# L5 (D3 flipped) the rebound holders release against their
4242
# current-epoch masters and both resources are immediately
4343
# re-acquirable. Pinned gap was: release silently swallowed.
44-
# L7 (D5 flipped) grd_recovery dump category: 13 counters, key
45-
# roster per spec-4.6 §2.4, episode trail asserted
46-
# (remaster_started/done, shards_remastered=2048,
44+
# L7 (D5 flipped) grd_recovery dump category: 31 keys (spec-4.6
45+
# §2.4 base 13 + spec-5.16 D5 join-direction 5 + spec-4.6a
46+
# liveness/episode surface 13), full key roster, episode trail
47+
# asserted (remaster_started/done, shards_remastered=2048,
4748
# holders_redeclared>=1, rebuild_timeout=0).
4849
#
4950
# Discipline notes:
@@ -395,22 +396,29 @@ sub poll_query_until_timeout
395396

396397

397398
# ----------
398-
# L7 (FLIPPED by D5; spec-5.16 D5 +5 join-direction counters): grd_recovery
399-
# dump category exposes 18 counters and the recovery episode left the
400-
# expected trail.
399+
# L7 (FLIPPED by D5; spec-5.16 D5 +5 join-direction counters; spec-4.6a
400+
# +13 episode/liveness keys): grd_recovery dump category exposes 31
401+
# keys and the recovery episode left the expected trail.
401402
# ----------
402403
is($pair->node1->safe_psql('postgres',
403404
q{SELECT count(*) FROM cluster_dump_state() WHERE category = 'grd_recovery'}),
404-
'18', 'L7 grd_recovery dump category exposes 18 counters (D5 + spec-5.16 join)');
405+
'31',
406+
'L7 grd_recovery dump category exposes 31 keys (spec-4.6 D5 + spec-5.16 join + spec-4.6a)');
405407

406408
is($pair->node1->safe_psql('postgres', q{
407409
SELECT string_agg(key, ',' ORDER BY key) FROM cluster_dump_state()
408410
WHERE category = 'grd_recovery'}),
409-
'block_path_failclosed,converts_requeued,holders_rebound,holders_redeclared,'
410-
. 'rebuild_timeout,remaster_done,remaster_failed,remaster_started,'
411-
. 'shards_remastered,stale_holder_swept,stale_request_drop,'
412-
. 'unaffected_holder_survived,waiters_requeued',
413-
'L7 grd_recovery key roster matches spec-4.6 §2.4');
411+
'block_path_failclosed,block_redeclare_cursor,block_redeclare_done,'
412+
. 'block_redeclare_epoch,cluster_gate_timeout,converts_requeued,'
413+
. 'done_self_bitmap_hash,done_self_epoch,episode_epoch,event_coordinator,'
414+
. 'event_old_epoch,holders_rebound,holders_redeclared,'
415+
. 'join_block_recovering_failclosed,join_block_views_rebuilt,'
416+
. 'join_remaster_done,join_remaster_started,join_shards_remastered,'
417+
. 'last_event_id,rebuild_timeout,remaster_done,remaster_failed,'
418+
. 'remaster_started,shards_remastered,stale_holder_swept,'
419+
. 'stale_request_drop,state,state_enum_value,unaffected_holder_survived,'
420+
. 'wait_epoch_escape,waiters_requeued',
421+
'L7 grd_recovery key roster (spec-4.6 §2.4 + spec-5.16 D5 + spec-4.6a)');
414422

415423
is($pair->node1->safe_psql('postgres',
416424
q{SELECT value::bigint >= 1 FROM cluster_dump_state()

0 commit comments

Comments
 (0)