diff options
author | Heikki Linnakangas | 2015-02-06 09:18:14 +0000 |
---|---|---|
committer | Heikki Linnakangas | 2015-02-06 09:27:12 +0000 |
commit | 3bc4c694271bfe28b909f43d45fe5168c18ad5b8 (patch) | |
tree | 4064144ae6f9a370ba228185a73fb4bee1e8eebf | |
parent | 48a565d78ba9413317d6095010cf622e9d6a36eb (diff) |
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.
-rw-r--r-- | doc/src/sgml/protocol.sgml | 2 | ||||
-rw-r--r-- | 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 31bbc0d4c2e..cec56978b74 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 f593c529842..121b33d2ab7 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); |