From 2af72cefeaa15e27277d327783fdec2748d9b758 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 4 Feb 2012 22:32:35 -0500 Subject: [PATCH] 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. --- src/backend/storage/ipc/standby.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index dc6833b3b1..2924d0ff65 100644 --- 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 -- 2.40.0