Add missing Assert and fix inaccurate elog message in standby_redo().

tglsfdc · tglsfdc · commit 2af72cefeaa1 · 2012-02-04T22:32:35.000-05:00
All other WAL redo routines either call RestoreBkpBlocks() or Assert that
they haven't been passed any backup blocks.  Make this one do likewise.
Also, fix incorrect routine name in its failure message.
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
@@ -718,6 +718,9 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 
+	/* Backup blocks are not used in standby records */
+	Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK));
+
 	/* Do nothing if we're not in hot standby mode */
 	if (standbyState == STANDBY_DISABLED)
 		return;
@@ -747,7 +750,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
 		ProcArrayApplyRecoveryInfo(&running);
 	}
 	else
-		elog(PANIC, "relation_redo: unknown op code %u", info);
+		elog(PANIC, "standby_redo: unknown op code %u", info);
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -718,6 +718,9 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)`
`718`	`718`	`{`
`719`	`719`	`uint8 info = record->xl_info & ~XLR_INFO_MASK;`
`720`	`720`
	`721`	`+ /* Backup blocks are not used in standby records */`
	`722`	`+ Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK));`
	`723`	`+`
`721`	`724`	`/* Do nothing if we're not in hot standby mode */`
`722`	`725`	`if (standbyState == STANDBY_DISABLED)`
`723`	`726`	`return;`
`@@ -747,7 +750,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)`
`747`	`750`	`ProcArrayApplyRecoveryInfo(&running);`
`748`	`751`	`}`
`749`	`752`	`else`
`750`		`- elog(PANIC, "relation_redo: unknown op code %u", info);`
	`753`	`+ elog(PANIC, "standby_redo: unknown op code %u", info);`
`751`	`754`	`}`
`752`	`755`
`753`	`756`	`static void`