diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2018-05-03 20:09:28 +0300 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2018-05-03 20:09:28 +0300 |
| commit | d9b3bc55201a185e6a9fb37f703592efde69c6e2 (patch) | |
| tree | 5b094d7f423c7cbc6006ce905db42f7504d4230b /src | |
| parent | eab8d6312f15b8efbab269fea66da8f5a1e7c65f (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/3AD85097-A3F3-4EBA-99BD-C38EDF8D2949@postgrespro.ru
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/twophase.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 88fa270fe3c..cdd0091a5f0 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -1377,6 +1377,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 @@ -1465,6 +1468,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit) RemoveGXact(gxact); MyLockedGxact = NULL; + RESUME_INTERRUPTS(); + pfree(buf); } |