Skip to content

Commit 26318c4

Browse files
committed
Fix ALTER COLUMN TYPE to not open a relation without any lock.
If the column being modified is referenced by a foreign key constraint of another table, ALTER TABLE would open the other table (to re-parse the constraint's definition) without having first obtained a lock on it. This was evidently intentional, but that doesn't mean it's really safe. It's especially not safe in 9.3, which pre-dates use of MVCC scans for catalog reads, but even in current releases it doesn't seem like a good idea. We know we'll need AccessExclusiveLock shortly to drop the obsoleted constraint, so just get that a little sooner to close the hole. Per testing with a patch that complains if we open a relation without holding any lock on it. I don't plan to back-patch that patch, but we should close the holes it identifies in all supported branches. Discussion: https://postgr.es/m/2038.1538335244@sss.pgh.pa.us
1 parent e5baf8c commit 26318c4

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/backend/commands/tablecmds.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8236,8 +8236,7 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
82368236
* appropriate work queue entries. We do this before dropping because in
82378237
* the case of a FOREIGN KEY constraint, we might not yet have exclusive
82388238
* lock on the table the constraint is attached to, and we need to get
8239-
* that before dropping. It's safe because the parser won't actually look
8240-
* at the catalogs to detect the existing entry.
8239+
* that before reparsing/dropping.
82418240
*
82428241
* We can't rely on the output of deparsing to tell us which relation to
82438242
* operate on, because concurrent activity might have made the name
@@ -8253,6 +8252,7 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
82538252
Form_pg_constraint con;
82548253
Oid relid;
82558254
Oid confrelid;
8255+
char contype;
82568256
bool conislocal;
82578257

82588258
tup = SearchSysCache1(CONSTROID, ObjectIdGetDatum(oldId));
@@ -8261,6 +8261,7 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
82618261
con = (Form_pg_constraint) GETSTRUCT(tup);
82628262
relid = con->conrelid;
82638263
confrelid = con->confrelid;
8264+
contype = con->contype;
82648265
conislocal = con->conislocal;
82658266
ReleaseSysCache(tup);
82668267

@@ -8273,6 +8274,15 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
82738274
if (!conislocal)
82748275
continue;
82758276

8277+
/*
8278+
* When rebuilding an FK constraint that references the table we're
8279+
* modifying, we might not yet have any lock on the FK's table, so get
8280+
* one now. We'll need AccessExclusiveLock for the DROP CONSTRAINT
8281+
* step, so there's no value in asking for anything weaker.
8282+
*/
8283+
if (relid != tab->relid && contype == CONSTRAINT_FOREIGN)
8284+
LockRelationOid(relid, AccessExclusiveLock);
8285+
82768286
ATPostAlterTypeParse(oldId, relid, confrelid,
82778287
(char *) lfirst(def_item),
82788288
wqueue, lockmode, tab->rewrite);

0 commit comments

Comments
 (0)