From ff16b40f8cac67a740f4edaa9fc2d9c7ba44c73a Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Fri, 6 Feb 2015 11:18:14 +0200 Subject: [PATCH] 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. --- doc/src/sgml/protocol.sgml | 2 +- src/backend/replication/walsender.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index efe75ea493..3a753a0b9b 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1371,7 +1371,7 @@ The commands accepted in walsender mode are: - 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. diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 25fcbca39e..af5c1cc3ba 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -316,7 +316,7 @@ IdentifySystem(void) logptr = GetStandbyFlushRecPtr(); } else - logptr = GetInsertRecPtr(); + logptr = GetFlushRecPtr(); snprintf(tli, sizeof(tli), "%u", ThisTimeLineID);