Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfbe8971

Browse files
committed
When performing a base backup, check for read errors.
The old code didn't differentiate between a read error and aconcurrent truncation. fread reports both of these by returning 0;you have to use feof() or ferror() to distinguish between them,which this code did not do.It might be a better idea to use read() rather than fread() here,so that we can display a less-generic error message, but I'm notsure that would qualify as a back-patchable bug fix, so just dothis much for now.Jeevan Chalke, reviewed by Jeevan Ladhe and by me.Discussion:http://postgr.es/m/CA+TgmobG4ywMzL5oQq2a8YKp8x2p3p1LOMMcGqpS7aekT9+ETA@mail.gmail.com
1 parent89535db commitfbe8971

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

‎src/backend/replication/basebackup.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,18 @@ static char *statrelpath = NULL;
8383
*/
8484
#defineTHROTTLING_FREQUENCY8
8585

86+
/*
87+
* Checks whether we encountered any error in fread(). fread() doesn't give
88+
* any clue what has happened, so we check with ferror(). Also, neither
89+
* fread() nor ferror() set errno, so we just throw a generic error.
90+
*/
91+
#defineCHECK_FREAD_ERROR(fp,filename) \
92+
do { \
93+
if (ferror(fp)) \
94+
ereport(ERROR, \
95+
(errmsg("could not read from file \"%s\"", filename))); \
96+
} while (0)
97+
8698
/* The actual number of bytes, transfer of which may cause sleep. */
8799
staticuint64throttling_sample;
88100

@@ -494,6 +506,8 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
494506
break;
495507
}
496508

509+
CHECK_FREAD_ERROR(fp,pathbuf);
510+
497511
if (len!=XLogSegSize)
498512
{
499513
CheckXLogRemoved(segno,tli);
@@ -1206,6 +1220,8 @@ sendFile(char *readfilename, char *tarfilename, struct stat * statbuf,
12061220
}
12071221
}
12081222

1223+
CHECK_FREAD_ERROR(fp,readfilename);
1224+
12091225
/* If the file was truncated while we were sending it, pad it with zeros */
12101226
if (len<statbuf->st_size)
12111227
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp