Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit41e66fe

Browse files
author
Amit Kapila
committed
Fix regression test failure caused by commit8d74fc9.
The tests didn't considered that an error unrelated to apply changes, e.g."replication origin with OID %d is already active ...", could occur on thetable sync worker before starting to copy changes.To make the test robust we instead need to check the expected error andthe source of error which will be either tablesync or apply worker.In passing remove the harmless option "streaming = off" from CreateSubscription command as that is anyway the default.Per buildfarm member sidewinder.Author: Masahiko SawadaReviewed-by: Hou Zhijie, Vignesh C, Amit KapilaDiscussion:https://postgr.es/m/CAD21AoDeScrsHhLyEPYqN3sydg6PxAPVBboK=30xJfUVihNZDA@mail.gmail.comDiscussion:https://postgr.es/m/E1mrtvV-0002Gz-73@gemulon.postgresql.org
1 parenteb7828f commit41e66fe

File tree

1 file changed

+34
-25
lines changed

1 file changed

+34
-25
lines changed

‎src/test/subscription/t/026_worker_stats.pl

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,38 @@
66
use warnings;
77
use PostgreSQL::Test::Cluster;
88
use PostgreSQL::Test::Utils;
9-
use Test::Moretests=>5;
9+
use Test::Moretests=>3;
1010

1111
# Test if the error reported on pg_stat_subscription_workers view is expected.
1212
subtest_subscription_error
1313
{
14-
my ($node,$relname,$xid,$expected_error,$msg) =@_;
14+
my ($node,$relname,$command,$xid,$by_apply_worker,$errmsg_prefix,$msg)
15+
=@_;
1516

1617
my$check_sql =qq[
17-
SELECT count(1) > 0 FROM pg_stat_subscription_workers
18-
WHERE last_error_relid = '$relname'::regclass];
19-
$check_sql .=" AND last_error_xid = '$xid'::xid;"if$xidne'';
20-
21-
# Wait for the error statistics to be updated.
22-
$node->poll_query_until(
23-
'postgres',$check_sql,
24-
)ordie"Timed out while waiting for statistics to be updated";
25-
26-
my$result =$node->safe_psql(
27-
'postgres',
28-
qq[
29-
SELECT subname, last_error_command, last_error_relid::regclass, last_error_count > 0
18+
SELECT count(1) > 0
3019
FROM pg_stat_subscription_workers
31-
WHERE last_error_relid = '$relname'::regclass;
32-
]);
33-
is($result,$expected_error,$msg);
20+
WHERE last_error_relid = '$relname'::regclass
21+
AND starts_with(last_error_message, '$errmsg_prefix')];
22+
23+
# subrelid
24+
$check_sql .=$by_apply_worker
25+
?qq[ AND subrelid IS NULL]
26+
:qq[ AND subrelid = '$relname'::regclass];
27+
28+
# last_error_command
29+
$check_sql .=$commandeq''
30+
?qq[ AND last_error_command IS NULL]
31+
:qq[ AND last_error_command = '$command'];
32+
33+
# last_error_xid
34+
$check_sql .=$xideq''
35+
?qq[ AND last_error_xid IS NULL]
36+
:qq[ AND last_error_xid = '$xid'::xid];
37+
38+
# Wait for the particular error statistics to be reported.
39+
$node->poll_query_until('postgres',$check_sql,
40+
)ordie"Timed out while waiting for" .$msg;
3441
}
3542

3643
# Create publisher node.
@@ -89,7 +96,7 @@ sub test_subscription_error
8996
# infinite error loop due to violating the unique constraint.
9097
$node_subscriber->safe_psql(
9198
'postgres',
92-
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr' PUBLICATION tap_pub WITH (streaming = off);");
99+
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr' PUBLICATION tap_pub;");
93100

94101
$node_publisher->wait_for_catchup('tap_sub');
95102

@@ -117,14 +124,16 @@ sub test_subscription_error
117124
SELECT pg_current_xact_id()::xid;
118125
COMMIT;
119126
]);
120-
test_subscription_error($node_subscriber,'test_tab1',$xid,
121-
qq(tap_sub|INSERT|test_tab1|t),
122-
'check the error reported by the apply worker');
127+
test_subscription_error($node_subscriber,'test_tab1','INSERT',$xid,
128+
1,# check apply worker error
129+
qq(duplicate key value violates unique constraint),
130+
'error reported by the apply worker');
123131

124132
# Check the table sync worker's error in the view.
125-
test_subscription_error($node_subscriber,'test_tab2','',
126-
qq(tap_sub||test_tab2|t),
127-
'check the error reported by the table sync worker');
133+
test_subscription_error($node_subscriber,'test_tab2','','',
134+
0,# check tablesync worker error
135+
qq(duplicate key value violates unique constraint),
136+
'the error reported by the table sync worker');
128137

129138
# Test for resetting subscription worker statistics.
130139
# Truncate test_tab1 and test_tab2 so that applying changes and table sync can

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp