Report WAL flush, not insert, position in replication IDENTIFY_SYSTEM

hlinnaka · hlinnaka · commit 3bc4c694271b · 2015-02-06T11:27:12.000+02:00
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
@@ -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
@@ -315,7 +315,7 @@ IdentifySystem(void)
 		logptr = GetStandbyFlushRecPtr();
 	}
 	else
-		logptr = GetInsertRecPtr();
+		logptr = GetFlushRecPtr();
 
 	snprintf(tli, sizeof(tli), "%u", ThisTimeLineID);
 

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ IdentifySystem(void)`
`315`	`315`	`logptr = GetStandbyFlushRecPtr();`
`316`	`316`	`}`
`317`	`317`	`else`
`318`		`- logptr = GetInsertRecPtr();`
	`318`	`+ logptr = GetFlushRecPtr();`
`319`	`319`
`320`	`320`	`snprintf(tli, sizeof(tli), "%u", ThisTimeLineID);`
`321`	`321`