NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitaba8943

committed

pg_upgrade: Improve error checking in rewriteVisibilityMap.

In the old logic, if read() were to return an error, we'd silently stoprewriting the visibility map at that point in the file. That's safe,but reporting the error is better, so do that instead.Report by Andres Freund. Patch by Masahiko Sawada, with one correctionby me.

1 parent6201a8e commitaba8943Copy full SHA for aba8943

File tree

1 file changed

+13

-2

lines changed

src/bin/pg_upgrade
- file.c

1 file changed

+13

-2

lines changed

`‎src/bin/pg_upgrade/file.c`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ rewriteVisibilityMap(const char fromfile, const char tofile, bool force)`
`165`	`165`	`intdst_fd=0;`
`166`	`166`	`charbuffer[BLCKSZ];`
`167`	`167`	`ssize_tbytesRead;`
	`168`	`+ssize_ttotalBytesRead=0;`
`168`	`169`	`ssize_tsrc_filesize;`
`169`	`170`	`intrewriteVmBytesPerPage;`
`170`	`171`	`BlockNumbernew_blkno=0;`
`@@ -200,13 +201,23 @@ rewriteVisibilityMap(const char fromfile, const char tofile, bool force)`
`200`	`201`	`* page is empty, we skip it, mostly to avoid turning one-page visibility`
`201`	`202`	`* maps for small relations into two pages needlessly.`
`202`	`203`	`*/`
`203`		`-while ((bytesRead=read(src_fd,buffer,BLCKSZ))==BLCKSZ)`
	`204`	`+while (totalBytesRead<src_filesize)`
`204`	`205`	`{`
`205`	`206`	`char*old_cur;`
`206`	`207`	`char*old_break;`
`207`	`208`	`char*old_blkend;`
`208`	`209`	`PageHeaderDatapageheader;`
`209`		`-boolold_lastblk= ((BLCKSZ* (new_blkno+1))==src_filesize);`
	`210`	`+boolold_lastblk;`
	`211`	`+`
	`212`	`+if ((bytesRead=read(src_fd,buffer,BLCKSZ))!=BLCKSZ)`
	`213`	`+{`
	`214`	`+close(dst_fd);`
	`215`	`+close(src_fd);`
	`216`	`+returngetErrorText();`
	`217`	`+}`
	`218`	`+`
	`219`	`+totalBytesRead+=BLCKSZ;`
	`220`	`+old_lastblk= (totalBytesRead==src_filesize);`
`210`	`221`
`211`	`222`	`/* Save the page header data */`
`212`	`223`	`memcpy(&pageheader,buffer,SizeOfPageHeaderData);`

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!

Commitaba8943

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/file.c`

0 commit comments