Fix recently-identified PITR recovery hazard: the base backup could contain

stale relcache init files (pg_internal.init), and there is no mechanism for
updating them during WAL replay.  Easiest solution is just to delete the init
files at conclusion of startup, and let the first backend started in each
database take care of rebuilding the init file.  Simon Riggs and Tom Lane.

Back-patched to 8.1.  Arguably this should be fixed in 8.0 too, but it would
require significantly more code since 8.0 has no handy startup-time scan of
pg_database to piggyback on.  Manual solution of the problem is possible
in 8.0 (just delete the pg_internal.init files before starting WAL replay),
so that may be a sufficient answer.

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index bd053fd186d41b28536643cdc4f1923b906f7490..62d4482574c053b81e240251a13a94bbaa1a309a 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -3425,3 +3425,25 @@ RelationCacheInitFileInvalidate(bool beforeSend)
                LWLockRelease(RelCacheInitLock);
        }
 }
+
+/*
+ * Remove the init file for a given database during postmaster startup.
+ *
+ * We used to keep the init file across restarts, but that is unsafe in PITR
+ * scenarios, and even in simple crash-recovery cases there are windows for
+ * the init file to become out-of-sync with the database.  So now we just
+ * remove it during startup and expect the first backend launch to rebuild it.
+ * Of course, this has to happen in each database of the cluster.  For
+ * simplicity this is driven by flatfiles.c, which has to scan pg_database
+ * anyway.
+ */
+void
+RelationCacheInitFileRemove(const char *dbPath)
+{
+       char            initfilename[MAXPGPATH];
+
+       snprintf(initfilename, sizeof(initfilename), "%s/%s",
+                        dbPath, RELCACHE_INIT_FILENAME);
+       unlink(initfilename);
+       /* ignore any error, since it might not be there at all */
+}

diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c
index 5ddb14c71af6d3dd879f0a7d74fe53085a88c364..3facc09385fde8035973c875ab7cc0cc20e4c3e1 100644 (file)
--- a/src/backend/utils/init/flatfiles.c
+++ b/src/backend/utils/init/flatfiles.c
@@ -34,6 +34,7 @@
 
 #include "access/heapam.h"
 #include "access/twophase_rmgr.h"
+#include "catalog/catalog.h"
 #include "catalog/pg_auth_members.h"
 #include "catalog/pg_authid.h"
 #include "catalog/pg_database.h"
@@ -46,6 +47,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/flatfiles.h"
+#include "utils/relcache.h"
 #include "utils/resowner.h"
 #include "utils/syscache.h"
 
@@ -165,9 +167,14 @@ name_okay(const char *str)
  *
  * A side effect is to determine the oldest database's datfrozenxid
  * so we can set or update the XID wrap limit.
+ *
+ * Also, if "startup" is true, we tell relcache.c to clear out the relcache
+ * init file in each database.  That's a bit nonmodular, but scanning
+ * pg_database twice during system startup seems too high a price for keeping
+ * things better separated.
  */
 static void
-write_database_file(Relation drel)
+write_database_file(Relation drel, bool startup)
 {
        char       *filename,
                           *tempname;
@@ -252,6 +259,17 @@ write_database_file(Relation drel)
                fputs_quote(datname, fp);
                fprintf(fp, " %u %u %u %u\n",
                                datoid, dattablespace, datfrozenxid, datvacuumxid);
+
+               /*
+                * Also clear relcache init file for each DB if starting up.
+                */
+               if (startup)
+               {
+                       char *dbpath = GetDatabasePath(datoid, dattablespace);
+
+                       RelationCacheInitFileRemove(dbpath);
+                       pfree(dbpath);
+               }
        }
        heap_endscan(scan);
 
@@ -673,6 +691,9 @@ write_auth_file(Relation rel_authid, Relation rel_authmem)
  * policy means we need not force initdb to change the format of the
  * flat files.
  *
+ * We also cause relcache init files to be flushed, for largely the same
+ * reasons.
+ *
  * In a standalone backend we pass database_only = true to skip processing
  * the auth file.  We won't need it, and building it could fail if there's
  * something corrupt in the authid/authmem catalogs.
@@ -703,7 +724,7 @@ BuildFlatFiles(bool database_only)
 
        /* No locking is needed because no one else is alive yet */
        rel_db = XLogOpenRelation(rnode);
-       write_database_file(rel_db);
+       write_database_file(rel_db, true);
 
        if (!database_only)
        {
@@ -791,7 +812,7 @@ AtEOXact_UpdateFlatFiles(bool isCommit)
        if (database_file_update_subid != InvalidSubTransactionId)
        {
                database_file_update_subid = InvalidSubTransactionId;
-               write_database_file(drel);
+               write_database_file(drel, false);
                heap_close(drel, NoLock);
        }
 

diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 89353706b7d641131eef210ad1a140499474e605..bfd673989cbad82d18199a3e09c7d516cfef58e2 100644 (file)
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -74,6 +74,7 @@ extern void AtEOSubXact_RelationCache(bool isCommit, SubTransactionId mySubid,
  */
 extern bool RelationIdIsInInitFile(Oid relationId);
 extern void RelationCacheInitFileInvalidate(bool beforeSend);
+extern void RelationCacheInitFileRemove(const char *dbPath);
 
 /* should be used only by relcache.c and catcache.c */
 extern bool criticalRelcachesBuilt;