diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index b85a666..e8d6754 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -350,6 +350,7 @@ MarkAsPreparing(TransactionId xid, const char *gid, gxact = TwoPhaseState->prepXacts[i]; if (strcmp(gxact->gid, gid) == 0) { + LWLockRelease(TwoPhaseStateLock); ereport(ERROR, (errcode(ERRCODE_DUPLICATE_OBJECT), errmsg("transaction identifier \"%s\" is already in use", @@ -359,11 +360,14 @@ MarkAsPreparing(TransactionId xid, const char *gid, /* Get a free gxact from the freelist */ if (TwoPhaseState->freeGXacts == NULL) + { + LWLockRelease(TwoPhaseStateLock); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("maximum number of prepared transactions reached"), errhint("Increase max_prepared_transactions (currently %d).", max_prepared_xacts))); + } gxact = TwoPhaseState->freeGXacts; TwoPhaseState->freeGXacts = gxact->next; @@ -497,16 +501,22 @@ LockGXact(const char *gid, Oid user) /* Found it, but has someone else got it locked? */ if (gxact->locking_backend != InvalidBackendId) + { + LWLockRelease(TwoPhaseStateLock); ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("prepared transaction with identifier \"%s\" is busy", gid))); + } if (user != gxact->owner && !superuser_arg(user)) + { + LWLockRelease(TwoPhaseStateLock); ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("permission denied to finish prepared transaction"), errhint("Must be superuser or the user that prepared the transaction."))); + } /* * Note: it probably would be possible to allow committing from @@ -515,10 +525,13 @@ LockGXact(const char *gid, Oid user) * someone gets motivated to make it work. */ if (MyDatabaseId != proc->databaseId) + { + LWLockRelease(TwoPhaseStateLock); ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("prepared transaction belongs to another database"), errhint("Connect to the database where the transaction was prepared to finish it."))); + } /* OK for me to lock it */ gxact->locking_backend = MyBackendId; diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 2826b7e..1224e4d 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -839,9 +839,12 @@ PreCommit_Notify(void) LWLockAcquire(AsyncQueueLock, LW_EXCLUSIVE); asyncQueueFillWarning(); if (asyncQueueIsFull()) + { + LWLockRelease(AsyncQueueLock); ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("too many notifications in the NOTIFY queue"))); + } nextNotify = asyncQueueAddEntries(nextNotify); LWLockRelease(AsyncQueueLock); } diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index fa1f07b..befd537 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -250,10 +250,13 @@ ReplicationSlotCreate(const char *name, bool db_specific, /* If all slots are in use, we're out of luck. */ if (slot == NULL) + { + LWLockRelease(ReplicationSlotAllocationLock); ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), errmsg("all replication slots are in use"), errhint("Free one or increase max_replication_slots."))); + } /* * Since this slot is not in use, nobody should be looking at any part of @@ -465,6 +468,9 @@ ReplicationSlotDropAcquired(void) vslot->active_pid = 0; SpinLockRelease(&slot->mutex); + if (!fail_softly) + LWLockRelease(ReplicationSlotAllocationLock); + ereport(fail_softly ? WARNING : ERROR, (errcode_for_file_access(), errmsg("could not rename file \"%s\" to \"%s\": %m", @@ -978,6 +984,8 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) S_IRUSR | S_IWUSR); if (fd < 0) { + if (elevel >= ERROR) + LWLockRelease(slot->io_in_progress_lock); ereport(elevel, (errcode_for_file_access(), errmsg("could not create file \"%s\": %m", diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index 29e46c2..7dec80f 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -511,6 +511,7 @@ dsm_create(Size size, int flags) pfree(seg); return NULL; } + LWLockRelease(DynamicSharedMemoryControlLock); ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_RESOURCES), errmsg("too many dynamic shared memory segments"))); diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 250e312..794386f 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -356,11 +356,14 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr) Assert(shmemseghdr->index == NULL); structPtr = ShmemAlloc(size); if (structPtr == NULL) + { + LWLockRelease(ShmemIndexLock); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("not enough shared memory for data structure" " \"%s\" (%zu bytes requested)", name, size))); + } shmemseghdr->index = structPtr; *foundPtr = FALSE; } diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 1eb2d4b..1946bca 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -1874,7 +1874,10 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock) HASH_FIND, NULL); if (!lock) + { + LWLockRelease(partitionLock); elog(ERROR, "failed to re-find shared lock object"); + } locallock->lock = lock; proclocktag.myLock = lock; @@ -1884,7 +1887,10 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock) HASH_FIND, NULL); if (!locallock->proclock) + { + LWLockRelease(partitionLock); elog(ERROR, "failed to re-find shared proclock object"); + } } LOCK_PRINT("LockRelease: found", lock, lockmode); proclock = locallock->proclock; @@ -2622,7 +2628,10 @@ FastPathGetRelationLockEntry(LOCALLOCK *locallock) HASH_FIND, NULL); if (!lock) + { + LWLockRelease(partitionLock); elog(ERROR, "failed to re-find shared lock object"); + } proclocktag.myLock = lock; proclocktag.myProc = MyProc; @@ -2635,7 +2644,10 @@ FastPathGetRelationLockEntry(LOCALLOCK *locallock) HASH_FIND, NULL); if (!proclock) + { + LWLockRelease(partitionLock); elog(ERROR, "failed to re-find shared proclock object"); + } LWLockRelease(partitionLock); } diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index b81ebeb..6f8564c 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -2315,10 +2315,14 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag, targettag, targettaghash, HASH_ENTER_NULL, &found); if (!target) + { + LWLockRelease(partitionLock); + LWLockRelease(SerializablePredicateLockListLock); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), errhint("You might need to increase max_pred_locks_per_transaction."))); + } if (!found) SHMQueueInit(&(target->predicateLocks)); @@ -2330,10 +2334,14 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag, PredicateLockHashCodeFromTargetHashCode(&locktag, targettaghash), HASH_ENTER_NULL, &found); if (!lock) + { + LWLockRelease(partitionLock); + LWLockRelease(SerializablePredicateLockListLock); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), errhint("You might need to increase max_pred_locks_per_transaction."))); + } if (!found) { @@ -3723,10 +3731,15 @@ ReleaseOneSerializableXact(SERIALIZABLEXACT *sxact, bool partial, targettaghash), HASH_ENTER_NULL, &found); if (!predlock) + { + LWLockRelease(partitionLock); + LWLockRelease(SerializablePredicateLockListLock); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), errhint("You might need to increase max_pred_locks_per_transaction."))); + } + if (found) { Assert(predlock->commitSeqNo != 0); @@ -3967,19 +3980,25 @@ CheckForSerializableConflictOut(bool visible, Relation relation, && (!SxactIsReadOnly(MySerializableXact) || conflictCommitSeqNo <= MySerializableXact->SeqNo.lastCommitBeforeSnapshot)) + { + LWLockRelease(SerializableXactHashLock); ereport(ERROR, (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE), errmsg("could not serialize access due to read/write dependencies among transactions"), errdetail_internal("Reason code: Canceled on conflict out to old pivot %u.", xid), errhint("The transaction might succeed if retried."))); + } if (SxactHasSummaryConflictIn(MySerializableXact) || !SHMQueueEmpty(&MySerializableXact->inConflicts)) + { + LWLockRelease(SerializableXactHashLock); ereport(ERROR, (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE), errmsg("could not serialize access due to read/write dependencies among transactions"), errdetail_internal("Reason code: Canceled on identification as a pivot, with conflict out to old committed transaction %u.", xid), errhint("The transaction might succeed if retried."))); + } MySerializableXact->flags |= SXACT_FLAG_SUMMARY_CONFLICT_OUT; } @@ -4866,9 +4885,12 @@ predicatelock_twophase_recover(TransactionId xid, uint16 info, LWLockAcquire(SerializableXactHashLock, LW_EXCLUSIVE); sxact = CreatePredXact(); if (!sxact) + { + LWLockRelease(SerializableXactHashLock); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"))); + } /* vxid for a prepared xact is InvalidBackendId/xid; no pid */ sxact->vxid.backendId = InvalidBackendId; diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index e745006..36888fa 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -5203,10 +5203,13 @@ RelationCacheInitFilePreInvalidate(void) * get rid of the would-be-obsolete init file. */ if (errno != ENOENT) + { + LWLockRelease(RelCacheInitLock); ereport(ERROR, (errcode_for_file_access(), errmsg("could not remove cache file \"%s\": %m", initfilename))); + } } } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index f43aff2..b9867fd 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -6886,9 +6886,12 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt) infile = AllocateFile(AutoConfFileName, "r"); if (infile == NULL) + { + LWLockRelease(AutoFileLock); ereport(ERROR, (errmsg("could not open file \"%s\": %m", AutoConfFileName))); + } /* parse it */ ParseConfigFp(infile, AutoConfFileName, 0, LOG, &head, &tail); @@ -6914,10 +6917,13 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt) O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR); if (Tmpfd < 0) + { + LWLockRelease(AutoFileLock); ereport(ERROR, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", AutoConfTmpFileName))); + } /* * Use a TRY block to clean up the file if we fail. Since we need a TRY @@ -6938,10 +6944,13 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt) * command. */ if (rename(AutoConfTmpFileName, AutoConfFileName) < 0) + { + LWLockRelease(AutoFileLock); ereport(ERROR, (errcode_for_file_access(), errmsg("could not rename file \"%s\" to \"%s\": %m", AutoConfTmpFileName, AutoConfFileName))); + } } PG_CATCH(); {