diff options
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/clog.c | 5 | ||||
| -rw-r--r-- | src/backend/access/transam/multixact.c | 5 | ||||
| -rw-r--r-- | src/backend/access/transam/xact.c | 5 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 23 | ||||
| -rw-r--r-- | src/backend/access/transam/xlogutils.c | 45 |
5 files changed, 58 insertions, 25 deletions
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index e9c422b85e..368d2c9d1a 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -26,7 +26,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.51 2009/01/01 17:23:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.52 2009/01/20 18:59:37 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -684,6 +684,9 @@ clog_redo(XLogRecPtr lsn, XLogRecord *record) { uint8 info = record->xl_info & ~XLR_INFO_MASK; + /* Backup blocks are not used in clog records */ + Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK)); + if (info == CLOG_ZEROPAGE) { int pageno; diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index a0ab280a1b..4888b0b36b 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -42,7 +42,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.29 2009/01/01 17:23:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.30 2009/01/20 18:59:37 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -1870,6 +1870,9 @@ multixact_redo(XLogRecPtr lsn, XLogRecord *record) { uint8 info = record->xl_info & ~XLR_INFO_MASK; + /* Backup blocks are not used in multixact records */ + Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK)); + if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE) { int pageno; diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 42f6bb8125..fbe5513547 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.271 2009/01/01 17:23:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.272 2009/01/20 18:59:37 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -4308,6 +4308,9 @@ xact_redo(XLogRecPtr lsn, XLogRecord *record) { uint8 info = record->xl_info & ~XLR_INFO_MASK; + /* Backup blocks are not used in xact records */ + Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK)); + if (info == XLOG_XACT_COMMIT) { xl_xact_commit *xlrec = (xl_xact_commit *) XLogRecGetData(record); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 9a2b3308b1..bf85d2ffae 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.327 2009/01/11 18:02:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.328 2009/01/20 18:59:37 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -2922,9 +2922,15 @@ CleanupBackupHistory(void) * page might not be. This will force us to replay all subsequent * modifications of the page that appear in XLOG, rather than possibly * ignoring them as already applied, but that's not a huge drawback. + * + * If 'cleanup' is true, a cleanup lock is used when restoring blocks. + * Otherwise, a normal exclusive lock is used. At the moment, that's just + * pro forma, because there can't be any regular backends in the system + * during recovery. The 'cleanup' argument applies to all backup blocks + * in the WAL record, that suffices for now. */ -static void -RestoreBkpBlocks(XLogRecord *record, XLogRecPtr lsn) +void +RestoreBkpBlocks(XLogRecPtr lsn, XLogRecord *record, bool cleanup) { Buffer buffer; Page page; @@ -2944,6 +2950,11 @@ RestoreBkpBlocks(XLogRecord *record, XLogRecPtr lsn) buffer = XLogReadBufferExtended(bkpb.node, bkpb.fork, bkpb.block, RBM_ZERO); Assert(BufferIsValid(buffer)); + if (cleanup) + LockBufferForCleanup(buffer); + else + LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); + page = (Page) BufferGetPage(buffer); if (bkpb.hole_length == 0) @@ -5199,9 +5210,6 @@ StartupXLOG(void) TransactionIdAdvance(ShmemVariableCache->nextXid); } - if (record->xl_info & XLR_BKP_BLOCK_MASK) - RestoreBkpBlocks(record, EndRecPtr); - RmgrTable[record->xl_rmid].rm_redo(EndRecPtr, record); /* Pop the error context stack */ @@ -6233,6 +6241,9 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record) { uint8 info = record->xl_info & ~XLR_INFO_MASK; + /* Backup blocks are not used in xlog records */ + Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK)); + if (info == XLOG_NEXTOID) { Oid nextOid; diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 02b281c86a..458af10ca1 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.66 2009/01/01 17:23:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.67 2009/01/20 18:59:37 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -217,8 +217,19 @@ XLogCheckInvalidPages(void) /* * XLogReadBuffer - * A shorthand of XLogReadBufferExtended(), for reading from the main - * fork. + * Read a page during XLOG replay. + * + * This is a shorthand of XLogReadBufferExtended() followed by + * LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE), for reading from the main + * fork. + * + * (Getting the lock is not really necessary, since we expect that this is + * only used during single-process XLOG replay, but some subroutines such + * as MarkBufferDirty will complain if we don't. And hopefully we'll get + * hot standby support in the future, where there will be backends running + * read-only queries during XLOG replay.) + * + * The returned buffer is exclusively-locked. * * For historical reasons, instead of a ReadBufferMode argument, this only * supports RBM_ZERO (init == true) and RBM_NORMAL (init == false) modes. @@ -226,22 +237,21 @@ XLogCheckInvalidPages(void) Buffer XLogReadBuffer(RelFileNode rnode, BlockNumber blkno, bool init) { - return XLogReadBufferExtended(rnode, MAIN_FORKNUM, blkno, - init ? RBM_ZERO : RBM_NORMAL); + Buffer buf; + buf = XLogReadBufferExtended(rnode, MAIN_FORKNUM, blkno, + init ? RBM_ZERO : RBM_NORMAL); + if (BufferIsValid(buf)) + LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE); + + return buf; } /* * XLogReadBufferExtended * Read a page during XLOG replay * - * This is functionally comparable to ReadBuffer followed by - * LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE): you get back a pinned - * and locked buffer. (Getting the lock is not really necessary, since we - * expect that this is only used during single-process XLOG replay, but - * some subroutines such as MarkBufferDirty will complain if we don't.) - * - * There's some differences in the behavior wrt. the "mode" argument, - * compared to ReadBufferExtended: + * This is functionally comparable to ReadBufferExtended. There's some + * differences in the behavior wrt. the "mode" argument: * * In RBM_NORMAL mode, if the page doesn't exist, or contains all-zeroes, we * return InvalidBuffer. In this case the caller should silently skip the @@ -306,16 +316,19 @@ XLogReadBufferExtended(RelFileNode rnode, ForkNumber forknum, Assert(BufferGetBlockNumber(buffer) == blkno); } - LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); - if (mode == RBM_NORMAL) { /* check that page has been initialized */ Page page = (Page) BufferGetPage(buffer); + /* + * We assume that PageIsNew is safe without a lock. During recovery, + * there should be no other backends that could modify the buffer at + * the same time. + */ if (PageIsNew(page)) { - UnlockReleaseBuffer(buffer); + ReleaseBuffer(buffer); log_invalid_page(rnode, forknum, blkno, true); return InvalidBuffer; } |