Fix bug in the WAL recovery code to finish an incomplete split.

hlinnaka · hlinnaka · commit 96675bff1f49 · 2008-06-11T08:38:56.000Z
CacheInvalidateRelcache() crashes if called in WAL recovery, because the
invalidation infrastructure hasn't been initialized yet.

Back-patch to 8.2, where the bug was introduced.
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.166 2008/05/12 00:00:45 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.167 2008/06/11 08:38:56 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -747,7 +747,8 @@ _bt_insertonpg(Relation rel,
 		/* release buffers; send out relcache inval if metapage changed */
 		if (BufferIsValid(metabuf))
 		{
-			CacheInvalidateRelcache(rel);
+			if (!InRecovery)
+				CacheInvalidateRelcache(rel);
 			_bt_relbuf(rel, metabuf);
 		}
 
@@ -1792,7 +1793,8 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
 	END_CRIT_SECTION();
 
 	/* send out relcache inval for metapage change */
-	CacheInvalidateRelcache(rel);
+	if (!InRecovery)
+		CacheInvalidateRelcache(rel);
 
 	/* done with metapage */
 	_bt_relbuf(rel, metabuf);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.166 2008/05/12 00:00:45 alvherre Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.167 2008/06/11 08:38:56 heikki Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -747,7 +747,8 @@ _bt_insertonpg(Relation rel,`
`747`	`747`	`/* release buffers; send out relcache inval if metapage changed */`
`748`	`748`	`if (BufferIsValid(metabuf))`
`749`	`749`	`{`
`750`		`- CacheInvalidateRelcache(rel);`
	`750`	`+ if (!InRecovery)`
	`751`	`+ CacheInvalidateRelcache(rel);`
`751`	`752`	`_bt_relbuf(rel, metabuf);`
`752`	`753`	`}`
`753`	`754`
`@@ -1792,7 +1793,8 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)`
`1792`	`1793`	`END_CRIT_SECTION();`
`1793`	`1794`
`1794`	`1795`	`/* send out relcache inval for metapage change */`
`1795`		`- CacheInvalidateRelcache(rel);`
	`1796`	`+ if (!InRecovery)`
	`1797`	`+ CacheInvalidateRelcache(rel);`
`1796`	`1798`
`1797`	`1799`	`/* done with metapage */`
`1798`	`1800`	`_bt_relbuf(rel, metabuf);`