Skip to content

Commit 069e31e

Browse files
MasaoFujiihopebo
authored andcommitted
Make XactLockTableWait() and ConditionalXactLockTableWait() interruptable more.
Previously, XactLockTableWait() and ConditionalXactLockTableWait() could enter a non-interruptible loop when they successfully acquired a lock on a transaction but the transaction still appeared to be running. Since this loop continued until the transaction completed, it could result in long, uninterruptible waits. Although this scenario is generally unlikely since XactLockTableWait() and ConditionalXactLockTableWait() can basically acquire a transaction lock only when the transaction is not running, it can occur in a hot standby. In such cases, the transaction may still appear active due to the KnownAssignedXids list, even while no lock on the transaction exists. For example, this situation can happen when creating a logical replication slot on a standby. The cause of the non-interruptible loop was the absence of CHECK_FOR_INTERRUPTS() within it. This commit adds CHECK_FOR_INTERRUPTS() to the loop in both functions, ensuring they can be interrupted safely. Back-patch to all supported branches. Author: Kevin K Biju <[email protected]> Reviewed-by: Fujii Masao <[email protected]> Discussion: https://postgr.es/m/CAM45KeELdjhS-rGuvN=ZLJ_asvZACucZ9LZWVzH7bGcD12DDwg@mail.gmail.com Backpatch-through: 13 (cherry picked from commit 24c5ad5be46dcaa1ba573f520cf366939a6cae77)
1 parent 5f2bcef commit 069e31e

File tree

1 file changed

+6
-0
lines changed
  • src/backend/storage/lmgr

1 file changed

+6
-0
lines changed

src/backend/storage/lmgr/lmgr.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,10 @@ XactLockTableWait(TransactionId xid, Relation rel, ItemPointer ctid,
715715
* through, to avoid slowing down the normal case.)
716716
*/
717717
if (!first)
718+
{
719+
CHECK_FOR_INTERRUPTS();
718720
pg_usleep(1000L);
721+
}
719722
first = false;
720723
xid = SubTransGetTopmostTransaction(xid);
721724
}
@@ -753,7 +756,10 @@ ConditionalXactLockTableWait(TransactionId xid)
753756

754757
/* See XactLockTableWait about this case */
755758
if (!first)
759+
{
760+
CHECK_FOR_INTERRUPTS();
756761
pg_usleep(1000L);
762+
}
757763
first = false;
758764
xid = SubTransGetTopmostTransaction(xid);
759765
}

0 commit comments

Comments
 (0)