diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2011-12-09 14:32:42 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2011-12-09 15:21:12 +0200 |
| commit | 9f0d2bdc88630781485a17178e2b50e49ce70040 (patch) | |
| tree | b8a85a2c176d85190c67b6533ab750fb0cd57ada /src/backend/access/transam/xlogutils.c | |
| parent | 5d8a894e3095b2f602e901c19689f3176bf20543 (diff) | |
| download | postgresql-9f0d2bdc88630781485a17178e2b50e49ce70040.tar.gz postgresql-9f0d2bdc88630781485a17178e2b50e49ce70040.zip | |
Don't set reachedMinRecoveryPoint during crash recovery. In crash recovery,
we don't reach consistency before replaying all of the WAL. Rename the
variable to reachedConsistency, to make its intention clearer.
In master, that was an active bug because of the recent patch to
immediately PANIC if a reference to a missing page is found in WAL after
reaching consistency, as Tom Lane's test case demonstrated. In 9.1 and 9.0,
the only consequence was a misleading "consistent recovery state reached at
%X/%X" message in the log at the beginning of crash recovery (the database
is not consistent at that point yet). In 8.4, the log message was not
printed in crash recovery, even though there was a similar
reachedMinRecoveryPoint local variable that was also set early. So,
backpatch to 9.1 and 9.0.
Diffstat (limited to 'src/backend/access/transam/xlogutils.c')
| -rw-r--r-- | src/backend/access/transam/xlogutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 350d434562a..b280434a829 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -85,7 +85,7 @@ log_invalid_page(RelFileNode node, ForkNumber forkno, BlockNumber blkno, * linger in the hash table until the end of recovery and PANIC there, * which might come only much later if this is a standby server. */ - if (reachedMinRecoveryPoint) + if (reachedConsistency) { report_invalid_page(WARNING, node, forkno, blkno, present); elog(PANIC, "WAL contains references to invalid pages"); |