summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeodor Sigaev2018-05-03 17:08:29 +0000
committerTeodor Sigaev2018-05-03 17:08:29 +0000
commit8f9be261f43772ccee2eae94d971bac6557cbe6a (patch)
treeda4804545f7aba4d462eddfec89da6f55c64d29b
parentcddc4dc6c6c9bc6f9e8e7f81b5264e7265a5c070 (diff)
Add HOLD_INTERRUPTS section into FinishPreparedTransaction.
If an interrupt arrives in the middle of FinishPreparedTransaction and any callback decide to call CHECK_FOR_INTERRUPTS (e.g. RemoveTwoPhaseFile can write a warning with ereport, which checks for interrupts) then it's possible to leave current GXact undeleted. Backpatch to all supported branches Stas Kelvich Discussion: ihttps://www.postgresql.org/message-id/[email protected]
-rw-r--r--src/backend/access/transam/twophase.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index cdd8156ce4d..65194db70e3 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1487,6 +1487,9 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
/* compute latestXid among all children */
latestXid = TransactionIdLatest(xid, hdr->nsubxacts, children);
+ /* Prevent cancel/die interrupt while cleaning up */
+ HOLD_INTERRUPTS();
+
/*
* The order of operations here is critical: make the XLOG entry for
* commit or abort, then mark the transaction committed or aborted in
@@ -1578,6 +1581,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
LWLockRelease(TwoPhaseStateLock);
MyLockedGxact = NULL;
+ RESUME_INTERRUPTS();
+
pfree(buf);
}