Skip to content

Commit bbd3363

Browse files
peterepetere
committed
Refactor subscription tests to use PostgresNode's wait_for_catchup
This was nearly the same code. Extend wait_for_catchup to allow waiting for pg_current_wal_lsn() and use that in the subscription tests. Also change one use in the pg_rewind tests to use this. Also remove some broken code in wait_for_catchup and wait_for_slot_catchup. The error message in case the waiting failed wanted to show the current LSN, but the way it was written never worked. So since nobody ever cared, just remove it. Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
1 parent 4d41b2e commit bbd3363

File tree

10 files changed

+42
-104
lines changed

10 files changed

+42
-104
lines changed

‎src/bin/pg_rewind/RewindTest.pm‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,7 @@ sub promote_standby
163163
# up standby
164164

165165
# Wait for the standby to receive and write all WAL.
166-
my $wal_received_query =
167-
"SELECT pg_current_wal_lsn() = write_lsn FROM pg_stat_replication WHERE application_name = 'rewind_standby';";
168-
$node_master->poll_query_until('postgres', $wal_received_query)
169-
or die "Timed out while waiting for standby to receive and write WAL";
166+
$node_master->wait_for_catchup('rewind_standby', 'write');
170167

171168
# Now promote standby and insert some new data on master, this will put
172169
# the master out-of-sync with the standby.

‎src/test/perl/PostgresNode.pm‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,8 @@ sub lsn
14651465
14661466
=item $node->wait_for_catchup(standby_name, mode, target_lsn)
14671467
1468-
Wait for the node with application_name standby_name (usually from node->name)
1468+
Wait for the node with application_name standby_name (usually from node->name,
1469+
also works for logical subscriptions)
14691470
until its replication location in pg_stat_replication equals or passes the
14701471
upstream's WAL insert point at the time this function is called. By default
14711472
the replay_lsn is waited for, but 'mode' may be specified to wait for any of
@@ -1477,6 +1478,7 @@ poll_query_until timeout.
14771478
Requires that the 'postgres' db exists and is accessible.
14781479
14791480
target_lsn may be any arbitrary lsn, but is typically $master_node->lsn('insert').
1481+
If omitted, pg_current_wal_lsn() is used.
14801482
14811483
This is not a test. It die()s on failure.
14821484
@@ -1497,18 +1499,25 @@ sub wait_for_catchup
14971499
{
14981500
$standby_name = $standby_name->name;
14991501
}
1500-
die 'target_lsn must be specified' unless defined($target_lsn);
1502+
my $lsn_expr;
1503+
if (defined($target_lsn))
1504+
{
1505+
$lsn_expr = "'$target_lsn'";
1506+
}
1507+
else
1508+
{
1509+
$lsn_expr = 'pg_current_wal_lsn()'
1510+
}
15011511
print "Waiting for replication conn "
15021512
. $standby_name . "'s "
15031513
. $mode
15041514
. "_lsn to pass "
15051515
. $target_lsn . " on "
15061516
. $self->name . "\n";
15071517
my $query =
1508-
qq[SELECT '$target_lsn' <= ${mode}_lsn FROM pg_catalog.pg_stat_replication WHERE application_name = '$standby_name';];
1518+
qq[SELECT $lsn_expr <= ${mode}_lsn FROM pg_catalog.pg_stat_replication WHERE application_name = '$standby_name';];
15091519
$self->poll_query_until('postgres', $query)
1510-
or die "timed out waiting for catchup, current location is "
1511-
. ($self->safe_psql('postgres', $query) || '(unknown)');
1520+
or die "timed out waiting for catchup";
15121521
print "done\n";
15131522
}
15141523

@@ -1550,8 +1559,7 @@ sub wait_for_slot_catchup
15501559
my $query =
15511560
qq[SELECT '$target_lsn' <= ${mode}_lsn FROM pg_catalog.pg_replication_slots WHERE slot_name = '$slot_name';];
15521561
$self->poll_query_until('postgres', $query)
1553-
or die "timed out waiting for catchup, current location is "
1554-
. ($self->safe_psql('postgres', $query) || '(unknown)');
1562+
or die "timed out waiting for catchup";
15551563
print "done\n";
15561564
}
15571565

‎src/test/subscription/t/001_rep_changes.pl‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@
6060
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub, tap_pub_ins_only"
6161
);
6262

63-
# Wait for subscriber to finish initialization
64-
my $caughtup_query =
65-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
66-
$node_publisher->poll_query_until('postgres', $caughtup_query)
67-
or die "Timed out while waiting for subscriber to catch up";
63+
$node_publisher->wait_for_catchup($appname);
6864

6965
# Also wait for initial table sync to finish
7066
my $synced_query =
@@ -93,8 +89,7 @@
9389
$node_publisher->safe_psql('postgres',
9490
"INSERT INTO tab_mixed VALUES (2, 'bar')");
9591

96-
$node_publisher->poll_query_until('postgres', $caughtup_query)
97-
or die "Timed out while waiting for subscriber to catch up";
92+
$node_publisher->wait_for_catchup($appname);
9893

9994
$result = $node_subscriber->safe_psql('postgres',
10095
"SELECT count(*), min(a), max(a) FROM tab_ins");
@@ -132,9 +127,7 @@
132127
$node_publisher->safe_psql('postgres',
133128
"UPDATE tab_full2 SET x = 'bb' WHERE x = 'b'");
134129

135-
# Wait for subscription to catch up
136-
$node_publisher->poll_query_until('postgres', $caughtup_query)
137-
or die "Timed out while waiting for subscriber to catch up";
130+
$node_publisher->wait_for_catchup($appname);
138131

139132
$result = $node_subscriber->safe_psql('postgres',
140133
"SELECT count(*), min(a), max(a) FROM tab_full");
@@ -176,8 +169,7 @@
176169
"INSERT INTO tab_ins SELECT generate_series(1001,1100)");
177170
$node_publisher->safe_psql('postgres', "DELETE FROM tab_rep");
178171

179-
$node_publisher->poll_query_until('postgres', $caughtup_query)
180-
or die "Timed out while waiting for subscriber to catch up";
172+
$node_publisher->wait_for_catchup($appname);
181173

182174
$result = $node_subscriber->safe_psql('postgres',
183175
"SELECT count(*), min(a), max(a) FROM tab_ins");
@@ -200,8 +192,7 @@
200192
);
201193
$node_publisher->safe_psql('postgres', "INSERT INTO tab_full VALUES(0)");
202194

203-
$node_publisher->poll_query_until('postgres', $caughtup_query)
204-
or die "Timed out while waiting for subscriber to catch up";
195+
$node_publisher->wait_for_catchup($appname);
205196

206197
# note that data are different on provider and subscriber
207198
$result = $node_subscriber->safe_psql('postgres',

‎src/test/subscription/t/002_types.pl‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,7 @@
106106
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub WITH (slot_name = tap_sub_slot)"
107107
);
108108

109-
# Wait for subscriber to finish initialization
110-
my $caughtup_query =
111-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
112-
$node_publisher->poll_query_until('postgres', $caughtup_query)
113-
or die "Timed out while waiting for subscriber to catch up";
109+
$node_publisher->wait_for_catchup($appname);
114110

115111
# Wait for initial sync to finish as well
116112
my $synced_query =
@@ -246,8 +242,7 @@
246242
(4, '"yellow horse"=>"moaned"');
247243
));
248244

249-
$node_publisher->poll_query_until('postgres', $caughtup_query)
250-
or die "Timed out while waiting for subscriber to catch up";
245+
$node_publisher->wait_for_catchup($appname);
251246

252247
# Check the data on subscriber
253248
my $result = $node_subscriber->safe_psql(
@@ -368,8 +363,7 @@
368363
UPDATE tst_hstore SET b = '"also"=>"updated"' WHERE a = 3;
369364
));
370365

371-
$node_publisher->poll_query_until('postgres', $caughtup_query)
372-
or die "Timed out while waiting for subscriber to catch up";
366+
$node_publisher->wait_for_catchup($appname);
373367

374368
# Check the data on subscriber
375369
$result = $node_subscriber->safe_psql(
@@ -489,8 +483,7 @@
489483
DELETE FROM tst_hstore WHERE a = 1;
490484
));
491485

492-
$node_publisher->poll_query_until('postgres', $caughtup_query)
493-
or die "Timed out while waiting for subscriber to catch up";
486+
$node_publisher->wait_for_catchup($appname);
494487

495488
# Check the data on subscriber
496489
$result = $node_subscriber->safe_psql(

‎src/test/subscription/t/003_constraints.pl‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,14 @@
3939
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub WITH (copy_data = false)"
4040
);
4141

42-
# Wait for subscriber to finish initialization
43-
my $caughtup_query =
44-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
45-
$node_publisher->poll_query_until('postgres', $caughtup_query)
46-
or die "Timed out while waiting for subscriber to catch up";
42+
$node_publisher->wait_for_catchup($appname);
4743

4844
$node_publisher->safe_psql('postgres',
4945
"INSERT INTO tab_fk (bid) VALUES (1);");
5046
$node_publisher->safe_psql('postgres',
5147
"INSERT INTO tab_fk_ref (id, bid) VALUES (1, 1);");
5248

53-
$node_publisher->poll_query_until('postgres', $caughtup_query)
54-
or die "Timed out while waiting for subscriber to catch up";
49+
$node_publisher->wait_for_catchup($appname);
5550

5651
# Check data on subscriber
5752
my $result = $node_subscriber->safe_psql('postgres',
@@ -69,8 +64,7 @@
6964
$node_publisher->safe_psql('postgres',
7065
"INSERT INTO tab_fk_ref (id, bid) VALUES (2, 2);");
7166

72-
$node_publisher->poll_query_until('postgres', $caughtup_query)
73-
or die "Timed out while waiting for subscriber to catch up";
67+
$node_publisher->wait_for_catchup($appname);
7468

7569
# FK is not enforced on subscriber
7670
$result = $node_subscriber->safe_psql('postgres',
@@ -104,8 +98,7 @@ BEGIN
10498
$node_publisher->safe_psql('postgres',
10599
"INSERT INTO tab_fk_ref (id, bid) VALUES (10, 10);");
106100

107-
$node_publisher->poll_query_until('postgres', $caughtup_query)
108-
or die "Timed out while waiting for subscriber to catch up";
101+
$node_publisher->wait_for_catchup($appname);
109102

110103
# The row should be skipped on subscriber
111104
$result = $node_subscriber->safe_psql('postgres',

‎src/test/subscription/t/004_sync.pl‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@
3737
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub"
3838
);
3939

40-
# Wait for subscriber to finish initialization
41-
my $caughtup_query =
42-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
43-
$node_publisher->poll_query_until('postgres', $caughtup_query)
44-
or die "Timed out while waiting for subscriber to catch up";
40+
$node_publisher->wait_for_catchup($appname);
4541

4642
# Also wait for initial table sync to finish
4743
my $synced_query =
@@ -124,9 +120,7 @@
124120
$node_publisher->safe_psql('postgres',
125121
"CREATE TABLE tab_rep_next (a) AS SELECT generate_series(1,10)");
126122

127-
# Wait for subscription to catch up
128-
$node_publisher->poll_query_until('postgres', $caughtup_query)
129-
or die "Timed out while waiting for subscriber to catch up";
123+
$node_publisher->wait_for_catchup($appname);
130124

131125
$result = $node_subscriber->safe_psql('postgres',
132126
"SELECT count(*) FROM tab_rep_next");
@@ -149,9 +143,7 @@
149143
$node_publisher->safe_psql('postgres',
150144
"INSERT INTO tab_rep_next SELECT generate_series(1,10)");
151145

152-
# Wait for subscription to catch up
153-
$node_publisher->poll_query_until('postgres', $caughtup_query)
154-
or die "Timed out while waiting for subscriber to catch up";
146+
$node_publisher->wait_for_catchup($appname);
155147

156148
$result = $node_subscriber->safe_psql('postgres',
157149
"SELECT count(*) FROM tab_rep_next");

‎src/test/subscription/t/005_encoding.pl‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
use TestLib;
66
use Test::More tests => 1;
77

8-
sub wait_for_caught_up
9-
{
10-
my ($node, $appname) = @_;
11-
12-
$node->poll_query_until('postgres',
13-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';"
14-
) or die "Timed out while waiting for subscriber to catch up";
15-
}
16-
178
my $node_publisher = get_new_node('publisher');
189
$node_publisher->init(
1910
allows_streaming => 'logical',
@@ -39,7 +30,7 @@ sub wait_for_caught_up
3930
"CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
4031
);
4132

42-
wait_for_caught_up($node_publisher, $appname);
33+
$node_publisher->wait_for_catchup($appname);
4334

4435
# Wait for initial sync to finish as well
4536
my $synced_query =
@@ -50,7 +41,7 @@ sub wait_for_caught_up
5041
$node_publisher->safe_psql('postgres',
5142
q{INSERT INTO test1 VALUES (1, E'Mot\xc3\xb6rhead')}); # hand-rolled UTF-8
5243

53-
wait_for_caught_up($node_publisher, $appname);
44+
$node_publisher->wait_for_catchup($appname);
5445

5546
is( $node_subscriber->safe_psql(
5647
'postgres', q{SELECT a FROM test1 WHERE b = E'Mot\xf6rhead'}

‎src/test/subscription/t/006_rewrite.pl‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
use TestLib;
66
use Test::More tests => 2;
77

8-
sub wait_for_caught_up
9-
{
10-
my ($node, $appname) = @_;
11-
12-
$node->poll_query_until('postgres',
13-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';"
14-
) or die "Timed out while waiting for subscriber to catch up";
15-
}
16-
178
my $node_publisher = get_new_node('publisher');
189
$node_publisher->init(allows_streaming => 'logical');
1910
$node_publisher->start;
@@ -35,7 +26,7 @@ sub wait_for_caught_up
3526
"CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
3627
);
3728

38-
wait_for_caught_up($node_publisher, $appname);
29+
$node_publisher->wait_for_catchup($appname);
3930

4031
# Wait for initial sync to finish as well
4132
my $synced_query =
@@ -45,7 +36,7 @@ sub wait_for_caught_up
4536

4637
$node_publisher->safe_psql('postgres', q{INSERT INTO test1 (a, b) VALUES (1, 'one'), (2, 'two');});
4738

48-
wait_for_caught_up($node_publisher, $appname);
39+
$node_publisher->wait_for_catchup($appname);
4940

5041
is($node_subscriber->safe_psql('postgres', q{SELECT a, b FROM test1}),
5142
qq(1|one
@@ -57,11 +48,11 @@ sub wait_for_caught_up
5748
$node_subscriber->safe_psql('postgres', $ddl2);
5849
$node_publisher->safe_psql('postgres', $ddl2);
5950

60-
wait_for_caught_up($node_publisher, $appname);
51+
$node_publisher->wait_for_catchup($appname);
6152

6253
$node_publisher->safe_psql('postgres', q{INSERT INTO test1 (a, b, c) VALUES (3, 'three', 33);});
6354

64-
wait_for_caught_up($node_publisher, $appname);
55+
$node_publisher->wait_for_catchup($appname);
6556

6657
is($node_subscriber->safe_psql('postgres', q{SELECT a, b, c FROM test1}),
6758
qq(1|one|0

‎src/test/subscription/t/007_ddl.pl‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
use TestLib;
66
use Test::More tests => 1;
77

8-
sub wait_for_caught_up
9-
{
10-
my ($node, $appname) = @_;
11-
12-
$node->poll_query_until('postgres',
13-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';"
14-
) or die "Timed out while waiting for subscriber to catch up";
15-
}
16-
178
my $node_publisher = get_new_node('publisher');
189
$node_publisher->init(allows_streaming => 'logical');
1910
$node_publisher->start;
@@ -35,7 +26,7 @@ sub wait_for_caught_up
3526
"CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
3627
);
3728

38-
wait_for_caught_up($node_publisher, $appname);
29+
$node_publisher->wait_for_catchup($appname);
3930

4031
$node_subscriber->safe_psql('postgres', q{
4132
BEGIN;

‎src/test/subscription/t/008_diff_schema.pl‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
use TestLib;
66
use Test::More tests => 3;
77

8-
sub wait_for_caught_up
9-
{
10-
my ($node, $appname) = @_;
11-
12-
$node->poll_query_until('postgres',
13-
"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';"
14-
) or die "Timed out while waiting for subscriber to catch up";
15-
}
16-
178
# Create publisher node
189
my $node_publisher = get_new_node('publisher');
1910
$node_publisher->init(allows_streaming => 'logical');
@@ -42,7 +33,7 @@ sub wait_for_caught_up
4233
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub"
4334
);
4435

45-
wait_for_caught_up($node_publisher, $appname);
36+
$node_publisher->wait_for_catchup($appname);
4637

4738
# Also wait for initial table sync to finish
4839
my $synced_query =
@@ -58,7 +49,7 @@ sub wait_for_caught_up
5849
# subscriber didn't change
5950
$node_publisher->safe_psql('postgres', "UPDATE test_tab SET b = md5(b)");
6051

61-
wait_for_caught_up($node_publisher, $appname);
52+
$node_publisher->wait_for_catchup($appname);
6253

6354
$result =
6455
$node_subscriber->safe_psql('postgres', "SELECT count(*), count(c), count(d = 999) FROM test_tab");
@@ -70,7 +61,7 @@ sub wait_for_caught_up
7061
$node_subscriber->safe_psql('postgres', "UPDATE test_tab SET c = 'epoch'::timestamptz + 987654321 * interval '1s'");
7162
$node_publisher->safe_psql('postgres', "UPDATE test_tab SET b = md5(a::text)");
7263

73-
wait_for_caught_up($node_publisher, $appname);
64+
$node_publisher->wait_for_catchup($appname);
7465

7566
$result =
7667
$node_subscriber->safe_psql('postgres', "SELECT count(*), count(extract(epoch from c) = 987654321), count(d = 999) FROM test_tab");

0 commit comments

Comments
 (0)