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

Commit 2b52086

Browse files
Revert "Temporary patch to help debug pg_walsummary test failures."
Thanks to commits ea18eb7, b6ee30e, and 19a829a, the 002_blocks.pl test now consistently passes, so we can remove this temporary debugging code. This reverts commit 5ddf997. Discussion: https://postgr.es/m/20240314210010.GA3056455%40nathanxps13
1 parent a0390f6 commit 2b52086

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

src/backend/backup/walsummary.c

-7
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,8 @@ RemoveWalSummaryIfOlderThan(WalSummaryFile *ws, time_t cutoff_time)
252252
ereport(ERROR,
253253
(errcode_for_file_access(),
254254
errmsg("could not stat file \"%s\": %m", path)));
255-
/* XXX temporarily changed to debug buildfarm failures */
256-
#if 0
257255
ereport(DEBUG2,
258256
(errmsg_internal("removing file \"%s\"", path)));
259-
#else
260-
ereport(LOG,
261-
(errmsg_internal("removing file \"%s\" cutoff_time=%llu", path,
262-
(unsigned long long) cutoff_time)));
263-
#endif
264257
}
265258

266259
/*

src/bin/pg_walsummary/t/002_blocks.pl

-14
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
SELECT MAX(end_lsn) AS summarized_lsn FROM pg_available_wal_summaries()
5252
EOM
5353
note("after insert, summarized through $summarized_lsn");
54-
note_wal_summary_dir("after insert", $node1);
5554

5655
# Update a row in the first block of the table and trigger a checkpoint.
5756
$node1->safe_psql('postgres', <<EOM);
@@ -78,15 +77,13 @@
7877
is(0+@lines, 1, "got exactly one new WAL summary");
7978
my ($tli, $start_lsn, $end_lsn) = split(/\|/, $lines[0]);
8079
note("examining summary for TLI $tli from $start_lsn to $end_lsn");
81-
note_wal_summary_dir("after new summary", $node1);
8280

8381
# Reconstruct the full pathname for the WAL summary file.
8482
my $filename = sprintf "%s/pg_wal/summaries/%08s%08s%08s%08s%08s.summary",
8583
$node1->data_dir, $tli,
8684
split(m@/@, $start_lsn),
8785
split(m@/@, $end_lsn);
8886
ok(-f $filename, "WAL summary file exists");
89-
note_wal_summary_dir("after existence check", $node1);
9087

9188
# Run pg_walsummary on it. We expect exactly two blocks to be modified,
9289
# block 0 and one other.
@@ -96,16 +93,5 @@
9693
like($stdout, qr/FORK main: block 0$/m, "stdout shows block 0 modified");
9794
is($stderr, '', 'stderr is empty');
9895
is(0+@lines, 2, "UPDATE modified 2 blocks");
99-
note_wal_summary_dir("after pg_walsummary run", $node1);
10096

10197
done_testing();
102-
103-
# XXX. Temporary debugging code.
104-
sub note_wal_summary_dir
105-
{
106-
my ($flair, $node) = @_;
107-
108-
my $wsdir = sprintf "%s/pg_wal/summaries", $node->data_dir;
109-
my @wsfiles = grep { $_ ne '.' && $_ ne '..' } slurp_dir($wsdir);
110-
note("$flair pg_wal/summaries has: @wsfiles");
111-
}

0 commit comments

Comments
 (0)