Force zero_damaged_pages to be effectively ON during recovery from WAL,

since there is no need to worry about damaged pages when we are going to
overwrite them anyway from the WAL.  Per recent discussion.

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index d95129df4e24eca535d4dc5b02b38983b3d76ceb..3fa2ffe4aa5d9cff66decbf7a28eafa476616b73 100644 (file)
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.141 2003/09/25 06:58:01 petere Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.141.2.1 2003/12/01 16:53:30 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -227,7 +227,13 @@ ReadBufferInternal(Relation reln, BlockNumber blockNum,
        if (status == SM_SUCCESS &&
            !PageHeaderIsValid((PageHeader) MAKE_PTR(bufHdr->data)))
        {
-           if (zero_damaged_pages)
+           /*
+            * During WAL recovery, the first access to any data page should
+            * overwrite the whole page from the WAL; so a clobbered page
+            * header is not reason to fail.  Hence, when InRecovery we may
+            * always act as though zero_damaged_pages is ON.
+            */
+           if (zero_damaged_pages || InRecovery)
            {
                ereport(WARNING,
                        (errcode(ERRCODE_DATA_CORRUPTED),