mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
Add assertions that we hold some relevant lock during relation open.
Opening a relation with no lock at all is unsafe; there's no guarantee that we'll see a consistent state of the relevant catalog entries. While use of MVCC scans to read the catalogs partially addresses that complaint, it's still possible to switch to a new catalog snapshot partway through loading the relcache entry. Moreover, whether or not you trust the reasoning behind sometimes using less than AccessExclusiveLock for ALTER TABLE, that reasoning is certainly not valid if concurrent users of the table don't hold a lock corresponding to the operation they want to perform. Hence, add some assertion-build-only checks that require any caller of relation_open(x, NoLock) to hold at least AccessShareLock. This isn't a full solution, since we can't verify that the lock level is semantically appropriate for the action --- but it's definitely of some use, because it's already caught two bugs. We can also assert that callers of addRangeTableEntryForRelation() hold at least the lock level specified for the new RTE. Amit Langote and Tom Lane Discussion: https://postgr.es/m/16565.1538327894@sss.pgh.pa.us
This commit is contained in:
@@ -287,6 +287,51 @@ UnlockRelation(Relation relation, LOCKMODE lockmode)
|
||||
LockRelease(&tag, lockmode, false);
|
||||
}
|
||||
|
||||
/*
|
||||
* CheckRelationLockedByMe
|
||||
*
|
||||
* Returns true if current transaction holds a lock on 'relation' of mode
|
||||
* 'lockmode'. If 'orstronger' is true, a stronger lockmode is also OK.
|
||||
* ("Stronger" is defined as "numerically higher", which is a bit
|
||||
* semantically dubious but is OK for the purposes we use this for.)
|
||||
*/
|
||||
bool
|
||||
CheckRelationLockedByMe(Relation relation, LOCKMODE lockmode, bool orstronger)
|
||||
{
|
||||
LOCKTAG tag;
|
||||
|
||||
SET_LOCKTAG_RELATION(tag,
|
||||
relation->rd_lockInfo.lockRelId.dbId,
|
||||
relation->rd_lockInfo.lockRelId.relId);
|
||||
|
||||
if (LockHeldByMe(&tag, lockmode))
|
||||
return true;
|
||||
|
||||
if (orstronger)
|
||||
{
|
||||
LOCKMODE slockmode;
|
||||
|
||||
for (slockmode = lockmode + 1;
|
||||
slockmode <= MaxLockMode;
|
||||
slockmode++)
|
||||
{
|
||||
if (LockHeldByMe(&tag, slockmode))
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
/* Sometimes this might be useful for debugging purposes */
|
||||
elog(WARNING, "lock mode %s substituted for %s on relation %s",
|
||||
GetLockmodeName(tag.locktag_lockmethodid, slockmode),
|
||||
GetLockmodeName(tag.locktag_lockmethodid, lockmode),
|
||||
RelationGetRelationName(relation));
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* LockHasWaitersRelation
|
||||
*
|
||||
|
Reference in New Issue
Block a user