From 8589299e03fff012e0bbb9716693750a0d68eef7 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Sat, 17 Jul 2021 13:19:17 -0400 Subject: [PATCH] Make new replication slot test code less racy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new test code added in ead9e51e8236 is racy -- it hinges on shared-memory state, which changes before the WARNING message is logged. Put it the other way around. Backpatch to 13. Author: Álvaro Herrera Discussion: https://postgr.es/m/202107161809.zclasccpfcg3@alvherre.pgsql --- src/test/recovery/t/019_replslot_limit.pl | 27 +++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/test/recovery/t/019_replslot_limit.pl b/src/test/recovery/t/019_replslot_limit.pl index f1a00c67f2..026da02ff1 100644 --- a/src/test/recovery/t/019_replslot_limit.pl +++ b/src/test/recovery/t/019_replslot_limit.pl @@ -177,18 +177,21 @@ ok( !find_in_log( my $logstart = get_log_size($node_primary); advance_wal($node_primary, 7); -# This slot should be broken, wait for that to happen -$node_primary->poll_query_until( - 'postgres', - qq[SELECT wal_status = 'lost' FROM pg_replication_slots - WHERE slot_name = 'rep1']); - -# WARNING should be issued -ok( find_in_log( - $node_primary, - "invalidating slot \"rep1\" because its restart_lsn [0-9A-F/]+ exceeds max_slot_wal_keep_size", - $logstart), - 'check that the warning is logged'); +# wait until the WARNING is issued +my $invalidated = 0; +for (my $i = 0; $i < 10000; $i++) +{ + if (find_in_log( + $node_primary, + "invalidating slot \"rep1\" because its restart_lsn [0-9A-F/]+ exceeds max_slot_wal_keep_size", + $logstart)) + { + $invalidated = 1; + last; + } + usleep(100_000); +} +ok($invalidated, 'check that slot invalidation has been logged'); $result = $node_primary->safe_psql( 'postgres',