From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 6 Feb 2015 09:18:14 +0000 (+0200)
Subject: Report WAL flush, not insert, position in replication IDENTIFY_SYSTEM
X-Git-Tag: REL9_4_2~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bc4c694271bfe28b909f43d45fe5168c18ad5b8;p=postgresql

Report WAL flush, not insert, position in replication IDENTIFY_SYSTEM

When beginning streaming replication, the client usually issues the
IDENTIFY_SYSTEM command, which used to return the current WAL insert
position. That's not suitable for the intended purpose of that field,
however. pg_receivexlog uses it to start replication from the reported
point, but if it hasn't been flushed to disk yet, it will fail. Change
IDENTIFY_SYSTEM to report the flush position instead.

Backpatch to 9.1 and above. 9.0 doesn't report any WAL position.
---

diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 31bbc0d4c2..cec56978b7 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1369,7 +1369,7 @@ The commands accepted in walsender mode are:
       </term>
       <listitem>
       <para>
-       Current xlog write location. Useful to get a known location in the
+       Current xlog flush location. Useful to get a known location in the
        transaction log where streaming can start.
       </para>
       </listitem>
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index f593c52984..121b33d2ab 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -315,7 +315,7 @@ IdentifySystem(void)
 		logptr = GetStandbyFlushRecPtr();
 	}
 	else
-		logptr = GetInsertRecPtr();
+		logptr = GetFlushRecPtr();
 
 	snprintf(tli, sizeof(tli), "%u", ThisTimeLineID);