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

Commit4576a69

Browse files
committed
Fix yet another race condition in recovery/t/001_stream_rep.pl.
In commit5c77690, we added polling in front of most of theget_slot_xmins calls in 001_stream_rep.pl, but today's results frombuildfarm member nightjar show that at least one more poll loopis needed.Proactively add a poll loop before the next-to-last get_slot_xmins callas well. It may be that there is no race condition there because thestandby_2 server is shut down at that point, but I'm quite tired offighting with this test script. The empirical evidence that it's safe,from the buildfarm, is no stronger than the evidence for the othercall that nightjar just proved unsafe.The only remaining get_slot_xmins calls without wait_slot_xminsprotection are the first two, which should be OK since nothing hashappened at that point. It's tempting to ignore that special caseand merge get_slot_xmins and wait_slot_xmins into a single function.I didn't go that far though.Discussion:https://postgr.es/m/18436.1502228036@sss.pgh.pa.us
1 parentb2c95a3 commit4576a69

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

‎src/test/recovery/t/001_stream_rep.pl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,13 @@ sub replay_check
220220
is($catalog_xmin,'',
221221
'catalog xmin of non-cascaded slot still null with hs_feedback');
222222

223+
wait_slot_xmins($node_standby_1,$slotname_2,
224+
"xmin IS NOT NULL AND catalog_xmin IS NULL");
225+
223226
my ($xmin1,$catalog_xmin1) = get_slot_xmins($node_standby_1,$slotname_2);
224227
isnt($xmin1,'','xmin of cascaded slot non-null with hs feedback');
225-
is($catalog_xmin1,'','catalog xmin of cascaded slot still null with hs_feedback');
228+
is($catalog_xmin1,'',
229+
'catalog xmin of cascaded slot still null with hs_feedback');
226230

227231
note"doing some work to advance xmin";
228232
$node_master->safe_psql('postgres',q{
@@ -297,6 +301,8 @@ sub replay_check
297301
'ALTER SYSTEM SET hot_standby_feedback = off;');
298302
$node_standby_2->stop;
299303

304+
wait_slot_xmins($node_standby_1,$slotname_2,"xmin IS NOT NULL");
305+
300306
($xmin,$catalog_xmin) = get_slot_xmins($node_standby_1,$slotname_2);
301307
isnt($xmin,'','xmin of cascaded slot non-null with postgres shut down');
302308

0 commit comments

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