aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2009-08-07 19:29:49 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2009-08-07 19:29:49 +0000
commit87740caa01956db89afdd2f5934d550c939d3c57 (patch)
treeb50e5b95ae6c3d899ee52e3d39baa9abc8f02f05
parentd2e7afe54aa8cdcfa2a8f2a3e1815b127c0c2c75 (diff)
downloadpostgresql-87740caa01956db89afdd2f5934d550c939d3c57.tar.gz
postgresql-87740caa01956db89afdd2f5934d550c939d3c57.zip
rm_cleanup functions need to be allowed to write WAL entries. This oversight
appears to explain the recent reports of "PANIC: cannot make new WAL entries during recovery".
-rw-r--r--src/backend/access/transam/xlog.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 5990bae8b84..f2fb9ed8f56 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.345 2009/06/26 20:29:04 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.346 2009/08/07 19:29:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -463,6 +463,7 @@ static void readRecoveryCommandFile(void);
static void exitArchiveRecovery(TimeLineID endTLI,
uint32 endLogId, uint32 endLogSeg);
static bool recoveryStopsHere(XLogRecord *record, bool *includeThis);
+static void LocalSetXLogInsertAllowed(void);
static void CheckPointGuts(XLogRecPtr checkPointRedo, int flags);
static bool XLogCheckBuffer(XLogRecData *rdata, bool doPageWrites,
@@ -5759,6 +5760,13 @@ StartupXLOG(void)
int rmid;
/*
+ * Resource managers might need to write WAL records, eg, to record
+ * index cleanup actions. So temporarily enable XLogInsertAllowed in
+ * this process only.
+ */
+ LocalSetXLogInsertAllowed();
+
+ /*
* Allow resource managers to do any required cleanup.
*/
for (rmid = 0; rmid <= RM_MAX_ID; rmid++)
@@ -5767,6 +5775,9 @@ StartupXLOG(void)
RmgrTable[rmid].rm_cleanup();
}
+ /* Disallow XLogInsert again */
+ LocalXLogInsertAllowed = -1;
+
/*
* Check to see if the XLOG sequence contained any unresolved
* references to uninitialized pages.