Skip to content

Commit db01fc9

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 0aa1e0e commit db01fc9

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
@@ -9513,8 +9513,7 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
95139513
* appropriate work queue entries. We do this before dropping because in
95149514
* the case of a FOREIGN KEY constraint, we might not yet have exclusive
95159515
* lock on the table the constraint is attached to, and we need to get
9516-
* that before dropping. It's safe because the parser won't actually look
9517-
* at the catalogs to detect the existing entry.
9516+
* that before reparsing/dropping.
95189517
*
95199518
* We can't rely on the output of deparsing to tell us which relation to
95209519
* operate on, because concurrent activity might have made the name
@@ -9530,6 +9529,7 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
95309529
Form_pg_constraint con;
95319530
Oid relid;
95329531
Oid confrelid;
9532+
char contype;
95339533
bool conislocal;
95349534

95359535
tup = SearchSysCache1(CONSTROID, ObjectIdGetDatum(oldId));
@@ -9538,6 +9538,7 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
95389538
con = (Form_pg_constraint) GETSTRUCT(tup);
95399539
relid = con->conrelid;
95409540
confrelid = con->confrelid;
9541+
contype = con->contype;
95419542
conislocal = con->conislocal;
95429543
ReleaseSysCache(tup);
95439544

@@ -9550,6 +9551,15 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
95509551
if (!conislocal)
95519552
continue;
95529553

9554+
/*
9555+
* When rebuilding an FK constraint that references the table we're
9556+
* modifying, we might not yet have any lock on the FK's table, so get
9557+
* one now. We'll need AccessExclusiveLock for the DROP CONSTRAINT
9558+
* step, so there's no value in asking for anything weaker.
9559+
*/
9560+
if (relid != tab->relid && contype == CONSTRAINT_FOREIGN)
9561+
LockRelationOid(relid, AccessExclusiveLock);
9562+
95539563
ATPostAlterTypeParse(oldId, relid, confrelid,
95549564
(char *) lfirst(def_item),
95559565
wqueue, lockmode, tab->rewrite);

0 commit comments

Comments
 (0)