NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0b1020a

committed

pg_waldump: Fix error message for WAL files smaller than XLOG_BLCKSZ.

When opening a WAL file smaller than XLOG_BLCKSZ (e.g. 0 bytes long) whiledetermining the wal_segment_size, pg_waldump checked errno, despite errno notbeing set by the short read. Resulting in a bogus error message.Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>Discussion:https://postgr.es/m/20220214.181847.775024684568733277.horikyota.ntt@gmail.comBackpatch: 11-, the bug was introducedinfc49e24

1 parentc255148 commit0b1020aCopy full SHA for 0b1020a

File tree

1 file changed

-8

lines changed

src/bin/pg_waldump
- pg_waldump.c

1 file changed

-8

lines changed

`‎src/bin/pg_waldump/pg_waldump.c`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,15 +204,12 @@ search_directory(const char directory, const char fname)`
`204`	`204`	`WalSegSz),`
`205`	`205`	`fname,WalSegSz);`
`206`	`206`	`}`
	`207`	`+elseif (r<0)`
	`208`	`+fatal_error("could not read file \"%s\": %m",`
	`209`	`+fname);`
`207`	`210`	`else`
`208`		`-{`
`209`		`-if (errno!=0)`
`210`		`-fatal_error("could not read file \"%s\": %m",`
`211`		`-fname);`
`212`		`-else`
`213`		`-fatal_error("could not read file \"%s\": read %d of %zu",`
`214`		`-fname,r, (Size)XLOG_BLCKSZ);`
`215`		`-}`
	`211`	`+fatal_error("could not read file \"%s\": read %d of %zu",`
	`212`	`+fname,r, (Size)XLOG_BLCKSZ);`
`216`	`213`	`close(fd);`
`217`	`214`	`return true;`
`218`	`215`	`}`

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!

Commit0b1020a

File tree

1 file changed

1 file changed

`‎src/bin/pg_waldump/pg_waldump.c`

0 commit comments