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

Commitb51985d

Browse files
author
Amit Kapila
committed
Fix the random test failure in 001_rep_changes.
The check to test whether the subscription workers were restarting after achange in the subscription was failing. The reason was that the test wasassuming the walsender started before it reaches the 'streaming' state andthe walsender was exiting due to an error before that. Now, the walsenderwas erroring out before reaching the 'streaming' state because it tries toacquire the slot before the previous walsender has exited.In passing, improve the die messages so that it is easier to investigatethe failures in the future if any.Reported-by: Michael Paquier, as per buildfarmAuthor: Ajin CherianReviewed-by: Masahiko Sawada, Amit KapilaBackpatch-through: 10, where this test was introducedDiscussion:https://postgr.es/m/YRnhFxa9bo73wfpV@paquier.xyz
1 parentdb11b4a commitb51985d

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -292,28 +292,30 @@
292292
'update works with dropped subscriber column');
293293

294294
# check that change of connection string and/or publication list causes
295-
# restart of subscription workers. Not all of these are registered as tests
296-
# as we need to poll for a change but the test suite will fail none the less
297-
# when something goes wrong.
295+
# restart of subscription workers. We check the state along with
296+
# application_name to ensure that the walsender is (re)started.
297+
#
298+
# Not all of these are registered as tests as we need to poll for a change
299+
# but the test suite will fail none the less when something goes wrong.
298300
my$oldpid =$node_publisher->safe_psql('postgres',
299-
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub';"
301+
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
300302
);
301303
$node_subscriber->safe_psql('postgres',
302304
"ALTER SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr sslmode=disable'"
303305
);
304306
$node_publisher->poll_query_until('postgres',
305-
"SELECT pid !=$oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub';"
306-
)ordie"Timed out while waiting for apply to restart";
307+
"SELECT pid !=$oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
308+
)ordie"Timed out while waiting for apply to restart after changing CONNECTION";
307309

308310
$oldpid =$node_publisher->safe_psql('postgres',
309-
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub';"
311+
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
310312
);
311313
$node_subscriber->safe_psql('postgres',
312314
"ALTER SUBSCRIPTION tap_sub SET PUBLICATION tap_pub_ins_only WITH (copy_data = false)"
313315
);
314316
$node_publisher->poll_query_until('postgres',
315-
"SELECT pid !=$oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub';"
316-
)ordie"Timed out while waiting for apply to restart";
317+
"SELECT pid !=$oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
318+
)ordie"Timed out while waiting for apply to restart after changing PUBLICATION";
317319

318320
$node_publisher->safe_psql('postgres',
319321
"INSERT INTO tab_ins SELECT generate_series(1001,1100)");
@@ -361,13 +363,13 @@
361363

362364
# check restart on rename
363365
$oldpid =$node_publisher->safe_psql('postgres',
364-
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub';"
366+
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
365367
);
366368
$node_subscriber->safe_psql('postgres',
367369
"ALTER SUBSCRIPTION tap_sub RENAME TO tap_sub_renamed");
368370
$node_publisher->poll_query_until('postgres',
369-
"SELECT pid !=$oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub_renamed';"
370-
)ordie"Timed out while waiting for apply to restart";
371+
"SELECT pid !=$oldpid FROM pg_stat_replication WHERE application_name = 'tap_sub_renamed' AND state = 'streaming';"
372+
)ordie"Timed out while waiting for apply to restart after renaming SUBSCRIPTION";
371373

372374
# check all the cleanup
373375
$node_subscriber->safe_psql('postgres',"DROP SUBSCRIPTION tap_sub_renamed");

0 commit comments

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