NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2b52086

committed

Revert "Temporary patch to help debug pg_walsummary test failures."

Thanks to commitsea18eb7,b6ee30e, and19a829a, the002_blocks.pl test now consistently passes, so we can remove thistemporary debugging code.This reverts commit5ddf997.Discussion:https://postgr.es/m/20240314210010.GA3056455%40nathanxps13

1 parenta0390f6 commit2b52086Copy full SHA for 2b52086

File tree

2 files changed

-21

lines changed

src
- backend/backup
  - walsummary.c
- bin/pg_walsummary/t
  - 002_blocks.pl

2 files changed

-21

lines changed

`‎src/backend/backup/walsummary.c‎`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,15 +252,8 @@ RemoveWalSummaryIfOlderThan(WalSummaryFile *ws, time_t cutoff_time)`
`252`	`252`	`ereport(ERROR,`
`253`	`253`	`(errcode_for_file_access(),`
`254`	`254`	`errmsg("could not stat file \"%s\": %m",path)));`
`255`		`-/* XXX temporarily changed to debug buildfarm failures */`
`256`		`-#if0`
`257`	`255`	`ereport(DEBUG2,`
`258`	`256`	`(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`
`264`	`257`	`}`
`265`	`258`
`266`	`259`	`/*`

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

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@`
`51`	`51`	`SELECT MAX(end_lsn) AS summarized_lsn FROM pg_available_wal_summaries()`
`52`	`52`	`EOM`
`53`	`53`	`note("after insert, summarized through$summarized_lsn");`
`54`		`-note_wal_summary_dir("after insert",$node1);`
`55`	`54`
`56`	`55`	`# Update a row in the first block of the table and trigger a checkpoint.`
`57`	`56`	`$node1->safe_psql('postgres',<<EOM);`
`@@ -78,15 +77,13 @@`
`78`	`77`	`is(0+@lines, 1,"got exactly one new WAL summary");`
`79`	`78`	`my ($tli,$start_lsn,$end_lsn) =split(/\\|/,$lines[0]);`
`80`	`79`	`note("examining summary for TLI$tli from$start_lsn to$end_lsn");`
`81`		`-note_wal_summary_dir("after new summary",$node1);`
`82`	`80`
`83`	`81`	`# Reconstruct the full pathname for the WAL summary file.`
`84`	`82`	`my$filename =sprintf"%s/pg_wal/summaries/%08s%08s%08s%08s%08s.summary",`
`85`	`83`	`$node1->data_dir,$tli,`
`86`	`84`	`split(m@/@,$start_lsn),`
`87`	`85`	`split(m@/@,$end_lsn);`
`88`	`86`	`ok(-f$filename,"WAL summary file exists");`
`89`		`-note_wal_summary_dir("after existence check",$node1);`
`90`	`87`
`91`	`88`	`# Run pg_walsummary on it. We expect exactly two blocks to be modified,`
`92`	`89`	`# block 0 and one other.`
`@@ -96,16 +93,5 @@`
`96`	`93`	`like($stdout,qr/FORK main: block 0$/m,"stdout shows block 0 modified");`
`97`	`94`	`is($stderr,'','stderr is empty');`
`98`	`95`	`is(0+@lines, 2,"UPDATE modified 2 blocks");`
`99`		`-note_wal_summary_dir("after pg_walsummary run",$node1);`
`100`	`96`
`101`	`97`	`done_testing();`
`102`		`-`
`103`		`-# XXX. Temporary debugging code.`
`104`		`-subnote_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)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2b52086

File tree

2 files changed

2 files changed

`‎src/backend/backup/walsummary.c‎`

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

0 commit comments