database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-09 06:21:09 +03:00
Code Activity

Fix base backup streaming xlog from standby

Browse Source 
When backing up from a standby server, the backup process
will not automatically switch xlog segment. So we must
accept a partially transferred xlog file in this case, but
rename it into position anyway.

In passing, merge the two callbacks for segment end and
stop stream into a single callback, since their implementations
were close to identical, and rename this callback to
reflect that it stops streaming rather than continues it.

Patch by Magnus Hagander, review by Fujii Masao
This commit is contained in:
Magnus Hagander
2012-05-25 11:36:22 +02:00
parent d226e236c6
commit 31d965819b
4 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/pg_basebackup/pg_basebackup.c
View File

@@ -78,7 +78,7 @@ static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum);
static void ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum);
static void BaseBackup(void);
static bool segment_callback(XLogRecPtr segendpos, uint32 timeline);
static bool reached_end_position(XLogRecPtr segendpos, uint32 timeline, bool segment_finished);
#ifdef HAVE_LIBZ
static const char *
@@ -129,8 +129,7 @@ usage(void)
/*
* Called in the background process whenever a complete segment of WAL
* has been received.
* Called in the background process every time data is received.
* On Unix, we check to see if there is any data on our pipe
* (which would mean we have a stop position), and if it is, check if
* it is time to stop.
@@ -138,7 +137,7 @@ usage(void)
* time to stop.
*/
static bool
segment_callback(XLogRecPtr segendpos, uint32 timeline)
reached_end_position(XLogRecPtr segendpos, uint32 timeline, bool segment_finished)
{
if (!has_xlogendptr)
{
@@ -231,7 +230,7 @@ LogStreamerMain(logstreamer_param * param)
{
if (!ReceiveXlogStream(param->bgconn, param->startptr, param->timeline,
param->sysidentifier, param->xlogdir,
segment_callback, NULL, standby_message_timeout))
reached_end_position, standby_message_timeout, true))
/*
* Any errors will already have been reported in the function process,