Fix bug in wasender's xlogid boundary handling, reported by Erik Rijkers.

hlinnaka · hlinnaka · commit 83cb7da7dcd1 · 2010-01-27T16:41:09.000Z
LogwrtRqst.Write can be set to non-existent FF log segment, we mustn't
try to send that in XLogSend().

Also fix similar bug in ReadRecord(), which I just introduced in the
ReadRecord() refactoring patch.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.362 2010/01/27 15:27:50 heikki Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.363 2010/01/27 16:41:09 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3574,6 +3574,12 @@ ReadRecord(XLogRecPtr *RecPtr, int emode_arg, bool fetching_ckpt)
 			NextLogPage(tmpRecPtr);
 			/* We will account for page header size below */
 		}
+
+		if (tmpRecPtr.xrecoff >= XLogFileSize)
+		{
+			(tmpRecPtr.xlogid)++;
+			tmpRecPtr.xrecoff = 0;
+		}
 	}
 	else
 	{
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.3 2010/01/21 08:19:57 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.4 2010/01/27 16:41:09 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -610,8 +610,8 @@ XLogSend(StringInfo outMsg)
 		return true;
 
 	/*
-	 * We gather multiple records together by issuing just one read() of
-	 * a suitable size, and send them as one CopyData message. Repeat
+	 * We gather multiple records together by issuing just one XLogRead()
+	 * of a suitable size, and send them as one CopyData message. Repeat
 	 * until we've sent everything we can.
 	 */
 	while (XLByteLT(sentPtr, SendRqstPtr))
@@ -628,11 +628,21 @@ XLogSend(StringInfo outMsg)
 		 * The rounding is not only for performance reasons. Walreceiver
 		 * relies on the fact that we never split a WAL record across two
 		 * messages. Since a long WAL record is split at page boundary into
-		 * continuation records, page boundary is alwayssafe cut-off point.
+		 * continuation records, page boundary is always a safe cut-off point.
 		 * We also assume that SendRqstPtr never points in the middle of a
 		 * WAL record.
 		 */
 		startptr = sentPtr;
+		if (startptr.xrecoff >= XLogFileSize)
+		{
+			/*
+			 * crossing a logid boundary, skip the non-existent last log
+			 * segment in previous logical log file.
+			 */
+			startptr.xlogid += 1;
+			startptr.xrecoff = 0;
+		}
+
 		endptr = startptr;
 		XLByteAdvance(endptr, MAX_SEND_SIZE);
 		/* round down to page boundary. */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.362 2010/01/27 15:27:50 heikki Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.363 2010/01/27 16:41:09 heikki Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -3574,6 +3574,12 @@ ReadRecord(XLogRecPtr *RecPtr, int emode_arg, bool fetching_ckpt)`
`3574`	`3574`	`NextLogPage(tmpRecPtr);`
`3575`	`3575`	`/* We will account for page header size below */`
`3576`	`3576`	`}`
	`3577`	`+`
	`3578`	`+ if (tmpRecPtr.xrecoff >= XLogFileSize)`
	`3579`	`+ {`
	`3580`	`+ (tmpRecPtr.xlogid)++;`
	`3581`	`+ tmpRecPtr.xrecoff = 0;`
	`3582`	`+ }`
`3577`	`3583`	`}`
`3578`	`3584`	`else`
`3579`	`3585`	`{`