Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f9c1b8d

Browse files
committed
Remove some unstable parts from new TAP test for archive status check
The test is proving to have timing issues when looking at archive status files on standbys after crash recovery, while other parts of the test rely on pg_stat_archiver as a wait point to make sure that a given state of the archiving is reached. The coverage is not heavily impacted by the removal those extra tests. Per reports from several buildfarm animals, like crake, piculet, culicidae and francolin. Discussion: https://postgr.es/m/20200424005929.GK33034@paquier.xyz Backpatch-through: 9.5
1 parent 4e87c48 commit f9c1b8d

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

src/test/recovery/t/020_archive_status.pl

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use warnings;
66
use PostgresNode;
77
use TestLib;
8-
use Test::More tests => 16;
8+
use Test::More tests => 13;
99
use Config;
1010

1111
my $primary = get_new_node('master');
@@ -136,23 +136,12 @@
136136
$standby1->start;
137137
$standby1->safe_psql('postgres', q{CHECKPOINT});
138138

139-
# Recovery with archive_mode=on does not keep .ready signal files inherited
140-
# from backup. Note that this WAL segment existed in the backup.
141-
ok( !-f "$standby1_data/$segment_path_1_ready",
142-
".ready file for WAL segment $segment_name_1 present in backup got removed with archive_mode=on on standby"
143-
);
144-
145139
# Recovery with archive_mode=on should not create .ready files.
146140
# Note that this segment did not exist in the backup.
147141
ok( !-f "$standby1_data/$segment_path_2_ready",
148142
".ready file for WAL segment $segment_name_2 not created on standby when archive_mode=on on standby"
149143
);
150144

151-
# Recovery with archive_mode = on creates .done files.
152-
ok( -f "$standby1_data/$segment_path_2_done",
153-
".done file for WAL segment $segment_name_2 created when archive_mode=on on standby"
154-
);
155-
156145
# Test recovery with archive_mode = always, which should always keep
157146
# .ready files if archiving is enabled, though here we want the archive
158147
# command to fail to persist the .ready files. Note that this node
@@ -170,10 +159,6 @@
170159
".ready file for WAL segment $segment_name_1 existing in backup is kept with archive_mode=always on standby"
171160
);
172161

173-
ok( -f "$standby2_data/$segment_path_2_ready",
174-
".ready file for WAL segment $segment_name_2 created with archive_mode=always on standby"
175-
);
176-
177162
# Reset statistics of the archiver for the next checks.
178163
$standby2->safe_psql('postgres', q{SELECT pg_stat_reset_shared('archiver')});
179164

0 commit comments

Comments
 (0)