mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_upgrade: Improve error checking in rewriteVisibilityMap.

Browse Source 
In the old logic, if read() were to return an error, we'd silently stop
rewriting 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 correction
by me.
This commit is contained in:
Robert Haas 2016-06-06 06:14:21 -04:00
parent 6201a8ef3a
commit aba8943082
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/pg_upgrade/file.c
View File

@ -165,6 +165,7 @@ rewriteVisibilityMap(const char *fromfile, const char *tofile, bool force)
int dst_fd = 0; int dst_fd = 0;
char buffer[BLCKSZ]; char buffer[BLCKSZ];
ssize_t bytesRead; ssize_t bytesRead;
ssize_t totalBytesRead = 0;
ssize_t src_filesize; ssize_t src_filesize;
int rewriteVmBytesPerPage; int rewriteVmBytesPerPage;
BlockNumber new_blkno = 0; BlockNumber new_blkno = 0;
@ -200,13 +201,23 @@ rewriteVisibilityMap(const char *fromfile, const char *tofile, bool force)
* page is empty, we skip it, mostly to avoid turning one-page visibility * page is empty, we skip it, mostly to avoid turning one-page visibility
* maps for small relations into two pages needlessly. * maps for small relations into two pages needlessly.
*/ */
while ((bytesRead = read(src_fd, buffer, BLCKSZ)) == BLCKSZ) while (totalBytesRead < src_filesize)
{ {
char *old_cur; char *old_cur;
char *old_break; char *old_break;
char *old_blkend; char *old_blkend;
PageHeaderData pageheader; PageHeaderData pageheader;
bool old_lastblk = ((BLCKSZ * (new_blkno + 1)) == src_filesize); bool old_lastblk;
if ((bytesRead = read(src_fd, buffer, BLCKSZ)) != BLCKSZ)
{
close(dst_fd);
close(src_fd);
return getErrorText();
}
totalBytesRead += BLCKSZ;
old_lastblk = (totalBytesRead == src_filesize);
/* Save the page header data */ /* Save the page header data */
memcpy(&pageheader, buffer, SizeOfPageHeaderData); memcpy(&pageheader, buffer, SizeOfPageHeaderData);