diff options
Diffstat (limited to 'src/backend/storage/lmgr/lmgr.c')
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 9a2f94beaf7..0b9f105b531 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -105,11 +105,12 @@ void LockRelationOid(Oid relid, LOCKMODE lockmode) { LOCKTAG tag; + LOCALLOCK *locallock; LockAcquireResult res; SetLocktagRelationOid(&tag, relid); - res = LockAcquire(&tag, lockmode, false, false); + res = LockAcquireExtended(&tag, lockmode, false, false, true, &locallock); /* * Now that we have the lock, check for invalidation messages, so that we @@ -120,9 +121,18 @@ LockRelationOid(Oid relid, LOCKMODE lockmode) * relcache entry in an undesirable way. (In the case where our own xact * modifies the rel, the relcache update happens via * CommandCounterIncrement, not here.) + * + * However, in corner cases where code acts on tables (usually catalogs) + * recursively, we might get here while still processing invalidation + * messages in some outer execution of this function or a sibling. The + * "cleared" status of the lock tells us whether we really are done + * absorbing relevant inval messages. */ - if (res != LOCKACQUIRE_ALREADY_HELD) + if (res != LOCKACQUIRE_ALREADY_CLEAR) + { AcceptInvalidationMessages(); + MarkLockClear(locallock); + } } /* @@ -138,11 +148,12 @@ bool ConditionalLockRelationOid(Oid relid, LOCKMODE lockmode) { LOCKTAG tag; + LOCALLOCK *locallock; LockAcquireResult res; SetLocktagRelationOid(&tag, relid); - res = LockAcquire(&tag, lockmode, false, true); + res = LockAcquireExtended(&tag, lockmode, false, true, true, &locallock); if (res == LOCKACQUIRE_NOT_AVAIL) return false; @@ -151,8 +162,11 @@ ConditionalLockRelationOid(Oid relid, LOCKMODE lockmode) * Now that we have the lock, check for invalidation messages; see notes * in LockRelationOid. */ - if (res != LOCKACQUIRE_ALREADY_HELD) + if (res != LOCKACQUIRE_ALREADY_CLEAR) + { AcceptInvalidationMessages(); + MarkLockClear(locallock); + } return true; } @@ -199,20 +213,24 @@ void LockRelation(Relation relation, LOCKMODE lockmode) { LOCKTAG tag; + LOCALLOCK *locallock; LockAcquireResult res; SET_LOCKTAG_RELATION(tag, relation->rd_lockInfo.lockRelId.dbId, relation->rd_lockInfo.lockRelId.relId); - res = LockAcquire(&tag, lockmode, false, false); + res = LockAcquireExtended(&tag, lockmode, false, false, true, &locallock); /* * Now that we have the lock, check for invalidation messages; see notes * in LockRelationOid. */ - if (res != LOCKACQUIRE_ALREADY_HELD) + if (res != LOCKACQUIRE_ALREADY_CLEAR) + { AcceptInvalidationMessages(); + MarkLockClear(locallock); + } } /* @@ -226,13 +244,14 @@ bool ConditionalLockRelation(Relation relation, LOCKMODE lockmode) { LOCKTAG tag; + LOCALLOCK *locallock; LockAcquireResult res; SET_LOCKTAG_RELATION(tag, relation->rd_lockInfo.lockRelId.dbId, relation->rd_lockInfo.lockRelId.relId); - res = LockAcquire(&tag, lockmode, false, true); + res = LockAcquireExtended(&tag, lockmode, false, true, true, &locallock); if (res == LOCKACQUIRE_NOT_AVAIL) return false; @@ -241,8 +260,11 @@ ConditionalLockRelation(Relation relation, LOCKMODE lockmode) * Now that we have the lock, check for invalidation messages; see notes * in LockRelationOid. */ - if (res != LOCKACQUIRE_ALREADY_HELD) + if (res != LOCKACQUIRE_ALREADY_CLEAR) + { AcceptInvalidationMessages(); + MarkLockClear(locallock); + } return true; } |