Repair very-low-probability race condition between relation extension

and VACUUM: in the interval between adding a new page to the relation
and formatting it, it was possible for VACUUM to come along and decide
it should format the page too.  Though not harmful in itself, this would
cause data loss if a third transaction were able to insert tuples into
the vacuumed page before the original extender got control back.

1 files changed, 15 insertions, 9 deletions

diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 67eb4ad7e24..2d0c0a93255 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.46 2002/08/06 02:36:33 tgl Exp $
+ *	  $Id: hio.c,v 1.46.2.1 2005/05/07 21:33:47 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -250,13 +250,6 @@ RelationGetBufferForTuple(Relation relation, Size len,
 	buffer = ReadBuffer(relation, P_NEW);
 
 	/*
-	 * Release the file-extension lock; it's now OK for someone else to
-	 * extend the relation some more.
-	 */
-	if (needLock)
-		UnlockPage(relation, 0, ExclusiveLock);
-
-	/*
 	 * We can be certain that locking the otherBuffer first is OK, since
 	 * it must have a lower page number.
 	 */
@@ -264,9 +257,22 @@ RelationGetBufferForTuple(Relation relation, Size len,
 		LockBuffer(otherBuffer, BUFFER_LOCK_EXCLUSIVE);
 
 	/*
-	 * We need to initialize the empty new page.
+	 * Now acquire lock on the new page.
 	 */
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
+
+	/*
+	 * Release the file-extension lock; it's now OK for someone else to
+	 * extend the relation some more.  Note that we cannot release this
+	 * lock before we have buffer lock on the new page, or we risk a
+	 * race condition against vacuumlazy.c --- see comments therein.
+	 */
+	if (needLock)
+		UnlockPage(relation, 0, ExclusiveLock);
+
+	/*
+	 * We need to initialize the empty new page.
+	 */
 	pageHeader = (Page) BufferGetPage(buffer);
 	Assert(PageIsNew((PageHeader) pageHeader));
 	PageInit(pageHeader, BufferGetPageSize(buffer), 0);