Fix streaming replication starting at the very first WAL segment.

hlinnaka · hlinnaka · commit cd2b7d3c4d1b · 2010-02-25T07:31:40.000Z
Per complaint from Greg Stark.
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.3 2010/02/03 09:47:19 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.4 2010/02/25 07:31:40 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,8 +84,6 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)
 	PGresult   *res;
 	char		cmd[64];
 
-	Assert(startpoint.xlogid != 0 || startpoint.xrecoff != 0);
-
 	/* Connect */
 	snprintf(conninfo_repl, sizeof(conninfo_repl), "%s replication=true", conninfo);
 
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -30,7 +30,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.7 2010/02/18 11:13:46 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.8 2010/02/25 07:31:40 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -573,15 +573,6 @@ XLogSend(StringInfo outMsg)
 	/* use volatile pointer to prevent code rearrangement */
 	volatile WalSnd *walsnd = MyWalSnd;
 
-	/*
-	 * Invalid position means that we have not yet received the initial
-	 * CopyData message from the slave that indicates where to start the
-	 * streaming.
-	 */
-	if (sentPtr.xlogid == 0 &&
-		sentPtr.xrecoff == 0)
-		return true;
-
 	/* Attempt to send all records flushed to the disk already */
 	SendRqstPtr = GetWriteRecPtr();
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.3 2010/02/03 09:47:19 heikki Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.4 2010/02/25 07:31:40 heikki Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -84,8 +84,6 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)`
`84`	`84`	`PGresult *res;`
`85`	`85`	`char cmd[64];`
`86`	`86`
`87`		`- Assert(startpoint.xlogid != 0 \|\| startpoint.xrecoff != 0);`
`88`		`-`
`89`	`87`	`/* Connect */`
`90`	`88`	`snprintf(conninfo_repl, sizeof(conninfo_repl), "%s replication=true", conninfo);`
`91`	`89`