Properly set relpersistence for fake relcache entries.

robertmhaas · robertmhaas · commit fef2c17807e0 · 2012-09-14T09:39:10.000-04:00
This can result in buffers failing to be properly flushed at
checkpoint time, leading to data loss.

Report, diagnosis, and patch by Jeff Davis.
diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
@@ -371,6 +371,8 @@ CreateFakeRelcacheEntry(RelFileNode rnode)
 	FakeRelCacheEntry fakeentry;
 	Relation	rel;
 
+	Assert(InRecovery);
+
 	/* Allocate the Relation struct and all related space in one block. */
 	fakeentry = palloc0(sizeof(FakeRelCacheEntryData));
 	rel = (Relation) fakeentry;
@@ -380,6 +382,9 @@ CreateFakeRelcacheEntry(RelFileNode rnode)
 	/* We will never be working with temp rels during recovery */
 	rel->rd_backend = InvalidBackendId;
 
+	/* It must be a permanent table if we're in recovery. */
+	rel->rd_rel->relpersistence = RELPERSISTENCE_PERMANENT;
+
 	/* We don't know the name of the relation; use relfilenode instead */
 	sprintf(RelationGetRelationName(rel), "%u", rnode.relNode);
 
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -269,6 +269,8 @@ ReadBufferWithoutRelcache(RelFileNode rnode, ForkNumber forkNum,
 
 	SMgrRelation smgr = smgropen(rnode, InvalidBackendId);
 
+	Assert(InRecovery);
+
 	return ReadBuffer_common(smgr, RELPERSISTENCE_PERMANENT, forkNum, blockNum,
 							 mode, strategy, &hit);
 }

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,8 @@ ReadBufferWithoutRelcache(RelFileNode rnode, ForkNumber forkNum,`
`269`	`269`
`270`	`270`	`SMgrRelation smgr = smgropen(rnode, InvalidBackendId);`
`271`	`271`
	`272`	`+ Assert(InRecovery);`
	`273`	`+`
`272`	`274`	`return ReadBuffer_common(smgr, RELPERSISTENCE_PERMANENT, forkNum, blockNum,`
`273`	`275`	`mode, strategy, &hit);`
`274`	`276`	`}`