diff options
| author | Magnus Hagander <magnus@hagander.net> | 2012-08-06 13:53:46 +0200 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2012-08-06 13:53:46 +0200 |
| commit | 254316f5a240621ea417329bd26320c53e283020 (patch) | |
| tree | 15ce52cec9c8687997f89fbce8c148a8f0b1cd53 /src | |
| parent | 3ff15883b1b4bcefb2278313a3137a688ebda505 (diff) | |
| download | postgresql-254316f5a240621ea417329bd26320c53e283020.tar.gz postgresql-254316f5a240621ea417329bd26320c53e283020.zip | |
Complain with proper error message if streaming stops prematurely
In particular, with a controlled shutdown of the master, pg_basebackup
with streaming log could terminate without an error message, even though
the backup is not consistent.
In passing, fix a few cases where walfile wasn't properly set to -1 after
closing.
Fujii Masao
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/receivelog.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c index c91cf1bbe86..5e7445626f2 100644 --- a/src/bin/pg_basebackup/receivelog.c +++ b/src/bin/pg_basebackup/receivelog.c @@ -611,11 +611,20 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, } PQclear(res); + /* Complain if we've not reached stop point yet */ + if (stream_stop != NULL && !stream_stop(blockpos, timeline, false)) + { + fprintf(stderr, _("%s: replication stream was terminated before stop point\n"), + progname); + goto error; + } + if (copybuf != NULL) PQfreemem(copybuf); if (walfile != -1 && close(walfile) != 0) fprintf(stderr, _("%s: could not close file %s: %s\n"), progname, current_walfile_name, strerror(errno)); + walfile = -1; return true; error: @@ -624,5 +633,6 @@ error: if (walfile != -1 && close(walfile) != 0) fprintf(stderr, _("%s: could not close file %s: %s\n"), progname, current_walfile_name, strerror(errno)); + walfile = -1; return false; } |