Fix two violations of the ResourceOwnerEnlarge/Remember protocol.

tglsfdc · tglsfdc · commit d7f59347bc06 · 2017-11-08T16:50:13.000-05:00
The point of having separate ResourceOwnerEnlargeFoo and
ResourceOwnerRememberFoo functions is so that resource allocation
can happen in between.  Doing it in some other order is just wrong.

OpenTemporaryFile() did open(), enlarge, remember, which would leak the
open file if the enlarge step ran out of memory.  Because fd.c has its own
layer of resource-remembering, the consequences look like they'd be limited
to an intratransaction FD leak, but it's still not good.

IncrBufferRefCount() did enlarge, remember, incr-refcount, which would blow
up if the incr-refcount step ever failed.  It was safe enough when written,
but since the introduction of PrivateRefCountHash, I think the assumption
that no error could happen there is pretty shaky.

The odds of real problems from either bug are probably small, but still,
back-patch to supported branches.

Thomas Munro and Tom Lane, per a comment from Andres Freund
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -2999,7 +2999,6 @@ IncrBufferRefCount(Buffer buffer)
 {
 	Assert(BufferIsPinned(buffer));
 	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
-	ResourceOwnerRememberBuffer(CurrentResourceOwner, buffer);
 	if (BufferIsLocal(buffer))
 		LocalRefCount[-buffer - 1]++;
 	else
@@ -3010,6 +3009,7 @@ IncrBufferRefCount(Buffer buffer)
 		Assert(ref != NULL);
 		ref->refcount++;
 	}
+	ResourceOwnerRememberBuffer(CurrentResourceOwner, buffer);
 }
 
 /*
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1194,6 +1194,13 @@ OpenTemporaryFile(bool interXact)
 {
 	File		file = 0;
 
+	/*
+	 * Make sure the current resource owner has space for this File before we
+	 * open it, if we'll be registering it below.
+	 */
+	if (!interXact)
+		ResourceOwnerEnlargeFiles(CurrentResourceOwner);
+
 	/*
 	 * If some temp tablespace(s) have been given to us, try to use the next
 	 * one.  If a given tablespace can't be found, we silently fall back to
@@ -1230,9 +1237,8 @@ OpenTemporaryFile(bool interXact)
 	{
 		VfdCache[file].fdstate |= FD_XACT_TEMPORARY;
 
-		ResourceOwnerEnlargeFiles(CurrentResourceOwner);
-		ResourceOwnerRememberFile(CurrentResourceOwner, file);
 		VfdCache[file].resowner = CurrentResourceOwner;
+		ResourceOwnerRememberFile(CurrentResourceOwner, file);
 
 		/* ensure cleanup happens at eoxact */
 		have_xact_temporary_files = true;

Original file line number	Diff line number	Diff line change
`@@ -2999,7 +2999,6 @@ IncrBufferRefCount(Buffer buffer)`
`2999`	`2999`	`{`
`3000`	`3000`	`Assert(BufferIsPinned(buffer));`
`3001`	`3001`	`ResourceOwnerEnlargeBuffers(CurrentResourceOwner);`
`3002`		`- ResourceOwnerRememberBuffer(CurrentResourceOwner, buffer);`
`3003`	`3002`	`if (BufferIsLocal(buffer))`
`3004`	`3003`	`LocalRefCount[-buffer - 1]++;`
`3005`	`3004`	`else`
`@@ -3010,6 +3009,7 @@ IncrBufferRefCount(Buffer buffer)`
`3010`	`3009`	`Assert(ref != NULL);`
`3011`	`3010`	`ref->refcount++;`
`3012`	`3011`	`}`
	`3012`	`+ ResourceOwnerRememberBuffer(CurrentResourceOwner, buffer);`
`3013`	`3013`	`}`
`3014`	`3014`
`3015`	`3015`	`/*`