Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 626731d

Browse files
committed
Lock the extension during ALTER EXTENSION ADD/DROP.
Although we were careful to lock the object being added or dropped, we failed to get any sort of lock on the extension itself. This allowed the ALTER to proceed in parallel with a DROP EXTENSION, which is problematic for a couple of reasons. If both commands succeeded we'd be left with a dangling link in pg_depend, which would cause problems later. Also, if the ALTER failed for some reason, it might try to print the extension's name, and that could result in a crash or (in older branches) a silly error message complaining about extension "(null)". Per bug #17098 from Alexander Lakhin. Back-patch to all supported branches. Discussion: https://postgr.es/m/17098-b960f3616c861f83@postgresql.org
1 parent 0e39a60 commit 626731d

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/backend/commands/extension.c

+11-3
Original file line numberDiff line numberDiff line change
@@ -3302,9 +3302,17 @@ ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt,
33023302
break;
33033303
}
33043304

3305-
extension.classId = ExtensionRelationId;
3306-
extension.objectId = get_extension_oid(stmt->extname, false);
3307-
extension.objectSubId = 0;
3305+
/*
3306+
* Find the extension and acquire a lock on it, to ensure it doesn't get
3307+
* dropped concurrently. A sharable lock seems sufficient: there's no
3308+
* reason not to allow other sorts of manipulations, such as add/drop of
3309+
* other objects, to occur concurrently. Concurrently adding/dropping the
3310+
* *same* object would be bad, but we prevent that by using a non-sharable
3311+
* lock on the individual object, below.
3312+
*/
3313+
extension = get_object_address(OBJECT_EXTENSION,
3314+
(Node *) makeString(stmt->extname),
3315+
&relation, AccessShareLock, false);
33083316

33093317
/* Permission check: must own extension */
33103318
if (!pg_extension_ownercheck(extension.objectId, GetUserId()))

0 commit comments

Comments
 (0)