aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2015-02-06 11:18:14 +0200
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2015-02-06 11:26:50 +0200
commitff16b40f8cac67a740f4edaa9fc2d9c7ba44c73a (patch)
tree7debeeafc8dcaf4a648552103ba687926f30ff53
parent5ee5bc387319b9ac33083bacebd3ab7046666328 (diff)
downloadpostgresql-ff16b40f8cac67a740f4edaa9fc2d9c7ba44c73a.tar.gz
postgresql-ff16b40f8cac67a740f4edaa9fc2d9c7ba44c73a.zip
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.sgml2
-rw-r--r--src/backend/replication/walsender.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index efe75ea493d..3a753a0b9b1 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1371,7 +1371,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 25fcbca39e9..af5c1cc3ba2 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);