NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitdb76ba0

committed

Fix bug with unfished prepared transactions in case of query cancel.

elog() called from xact callback caused CHECK_FOR_INTERRUPTS() andcancelled FinishPreparedTransaction() after WAL record was emmitedbut before ProcArray and GXact were emptied. So move callbackdown after sensible processing is finished.

1 parent86fd22d commitdb76ba0Copy full SHA for db76ba0

File tree

1 file changed

-7

lines changed

src/backend/access/transam
- twophase.c

1 file changed

-7

lines changed

`‎src/backend/access/transam/twophase.c`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1573,12 +1573,10 @@ FinishPreparedTransaction(const char *gid, bool isCommit)`
`1573`	`1573`	`intndelrels;`
`1574`	`1574`	`SharedInvalidationMessage*invalmsgs;`
`1575`	`1575`	`inti;`
	`1576`	`+XactEventfinish_event;`
`1576`	`1577`
`1577`		`-`
`1578`		`-if (isCommit)`
`1579`		`-{`
	`1578`	`+if (isCommit)`
`1580`	`1579`	`CallXactCallbacks(XACT_EVENT_PRE_COMMIT_PREPARED);`
`1581`		`-}`
`1582`	`1580`
`1583`	`1581`	`/*`
`1584`	`1582`	`* Validate the GID, and lock the GXACT to ensure that two backends do not`
`@@ -1634,17 +1632,17 @@ FinishPreparedTransaction(const char *gid, bool isCommit)`
`1634`	`1632`	`hdr->ncommitrels,commitrels,`
`1635`	`1633`	`hdr->ninvalmsgs,invalmsgs,`
`1636`	`1634`	`hdr->initfileinval,gid);`
`1637`		`-CallXactCallbacks(XACT_EVENT_COMMIT_PREPARED);`
	`1635`	`+finish_event=XACT_EVENT_COMMIT_PREPARED;`
`1638`	`1636`	`}`
`1639`	`1637`	`else`
`1640`	`1638`	`{`
`1641`	`1639`	`RecordTransactionAbortPrepared(xid,`
`1642`	`1640`	`hdr->nsubxacts,children,`
`1643`	`1641`	`hdr->nabortrels,abortrels,`
`1644`	`1642`	`gid);`
`1645`		`-CallXactCallbacks(XACT_EVENT_ABORT_PREPARED);`
	`1643`	`+finish_event=XACT_EVENT_ABORT_PREPARED;`
`1646`	`1644`	`}`
`1647`		`-`
	`1645`	`+`
`1648`	`1646`
`1649`	`1647`	`ProcArrayRemove(proc,latestXid);`
`1650`	`1648`
`@@ -1716,6 +1714,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit)`
`1716`	`1714`	`MyLockedGxact=NULL;`
`1717`	`1715`
`1718`	`1716`	`pfree(buf);`
	`1717`	`+`
	`1718`	`+CallXactCallbacks(finish_event);`
`1719`	`1719`	`}`
`1720`	`1720`
`1721`	`1721`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdb76ba0

File tree

1 file changed

1 file changed

`‎src/backend/access/transam/twophase.c`

0 commit comments