From cd2b7d3c4d1b3daa4f8e07d5702ed9e699adc361 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 25 Feb 2010 07:31:40 +0000 Subject: [PATCH] Fix streaming replication starting at the very first WAL segment. Per complaint from Greg Stark. --- .../replication/libpqwalreceiver/libpqwalreceiver.c | 4 +--- src/backend/replication/walsender.c | 11 +---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 039370a851..875dbafa11 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.3 2010/02/03 09:47:19 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.4 2010/02/25 07:31:40 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -84,8 +84,6 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint) PGresult *res; char cmd[64]; - Assert(startpoint.xlogid != 0 || startpoint.xrecoff != 0); - /* Connect */ snprintf(conninfo_repl, sizeof(conninfo_repl), "%s replication=true", conninfo); diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index bf533fff73..a8706ab06f 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -30,7 +30,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.7 2010/02/18 11:13:46 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.8 2010/02/25 07:31:40 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -573,15 +573,6 @@ XLogSend(StringInfo outMsg) /* use volatile pointer to prevent code rearrangement */ volatile WalSnd *walsnd = MyWalSnd; - /* - * Invalid position means that we have not yet received the initial - * CopyData message from the slave that indicates where to start the - * streaming. - */ - if (sentPtr.xlogid == 0 && - sentPtr.xrecoff == 0) - return true; - /* Attempt to send all records flushed to the disk already */ SendRqstPtr = GetWriteRecPtr(); -- 2.40.0