Commit 2af72cef authored by Tom Lane's avatar Tom Lane

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

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.
parent 9bff0780
...@@ -718,6 +718,9 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record) ...@@ -718,6 +718,9 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
{ {
uint8 info = record->xl_info & ~XLR_INFO_MASK; 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 */ /* Do nothing if we're not in hot standby mode */
if (standbyState == STANDBY_DISABLED) if (standbyState == STANDBY_DISABLED)
return; return;
...@@ -747,7 +750,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record) ...@@ -747,7 +750,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
ProcArrayApplyRecoveryInfo(&running); ProcArrayApplyRecoveryInfo(&running);
} }
else else
elog(PANIC, "relation_redo: unknown op code %u", info); elog(PANIC, "standby_redo: unknown op code %u", info);
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment