diff options
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/ipc/procarray.c | 9 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 10 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 738c0484d33..281fe671bdf 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -3654,14 +3654,7 @@ KnownAssignedXidsAdd(TransactionId from_xid, TransactionId to_xid, * If it still won't fit then we're out of memory */ if (head + nxids > pArray->maxKnownAssignedXids) - { - StandbyParamErrorPauseRecovery(); - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of shared memory"), - errdetail("There are no more KnownAssignedXids slots."), - errhint("You might need to increase max_connections."))); - } + elog(ERROR, "too many KnownAssignedXids"); } /* Now we can insert the xids into the space starting at head */ diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index c8def1674f4..3013ef63d05 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -965,13 +965,10 @@ LockAcquireExtended(const LOCKTAG *locktag, if (locallockp) *locallockp = NULL; if (reportMemoryError) - { - StandbyParamErrorPauseRecovery(); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), errhint("You might need to increase max_locks_per_transaction."))); - } else return LOCKACQUIRE_NOT_AVAIL; } @@ -1006,13 +1003,10 @@ LockAcquireExtended(const LOCKTAG *locktag, if (locallockp) *locallockp = NULL; if (reportMemoryError) - { - StandbyParamErrorPauseRecovery(); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), errhint("You might need to increase max_locks_per_transaction."))); - } else return LOCKACQUIRE_NOT_AVAIL; } @@ -2834,7 +2828,6 @@ FastPathGetRelationLockEntry(LOCALLOCK *locallock) { LWLockRelease(partitionLock); LWLockRelease(&MyProc->backendLock); - StandbyParamErrorPauseRecovery(); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), @@ -4165,7 +4158,6 @@ lock_twophase_recover(TransactionId xid, uint16 info, if (!lock) { LWLockRelease(partitionLock); - StandbyParamErrorPauseRecovery(); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), @@ -4231,7 +4223,6 @@ lock_twophase_recover(TransactionId xid, uint16 info, elog(PANIC, "lock table corrupted"); } LWLockRelease(partitionLock); - StandbyParamErrorPauseRecovery(); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), @@ -4524,7 +4515,6 @@ VirtualXactLock(VirtualTransactionId vxid, bool wait) { LWLockRelease(partitionLock); LWLockRelease(&proc->backendLock); - StandbyParamErrorPauseRecovery(); ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), |