NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit94b4f7e

committed

Tighten up application of parallel mode checks.

Commit924bcf4 failed to enforceparallel mode checks during the commit of a parallel worker, becausewe exited parallel mode prior to ending the transaction so that wecould pop the active snapshot. Re-establish parallel mode duringparallel worker commit. Without this, it's far too easy for unsafeactions during the pre-commit sequence to crash the server instead ofhitting the error checks as intended.Just to be extra paranoid, adjust a couple of the sanity checks inxact.c to check not only IsInParallelMode() but alsoIsParallelWorker().

1 parent423ec08 commit94b4f7eCopy full SHA for 94b4f7e

File tree

1 file changed

-5

lines changed

src/backend/access/transam
- xact.c

1 file changed

-5

lines changed

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

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ AssignTransactionId(TransactionState s)`
`497`	`497`	`* Workers synchronize transaction state at the beginning of each parallel`
`498`	`498`	`* operation, so we can't account for new XIDs at this point.`
`499`	`499`	`*/`
`500`		`-if (IsInParallelMode())`
	`500`	`+if (IsInParallelMode()\|\|IsParallelWorker())`
`501`	`501`	`elog(ERROR,"cannot assign XIDs during a parallel operation");`
`502`	`502`
`503`	`503`	`/*`
`@@ -931,7 +931,7 @@ CommandCounterIncrement(void)`
`931`	`931`	`* parallel operation, so we can't account for new commands after that`
`932`	`932`	`* point.`
`933`	`933`	`*/`
`934`		`-if (IsInParallelMode())`
	`934`	`+if (IsInParallelMode()\|\|IsParallelWorker())`
`935`	`935`	`elog(ERROR,"cannot start commands during a parallel operation");`
`936`	`936`
`937`	`937`	`currentCommandId+=1;`
`@@ -1927,6 +1927,10 @@ CommitTransaction(void)`
`1927`	`1927`
`1928`	`1928`	`is_parallel_worker= (s->blockState==TBLOCK_PARALLEL_INPROGRESS);`
`1929`	`1929`
	`1930`	`+/* Enforce parallel mode restrictions during parallel worker commit. */`
	`1931`	`+if (is_parallel_worker)`
	`1932`	`+EnterParallelMode();`
	`1933`	`+`
`1930`	`1934`	`ShowTransactionState("CommitTransaction");`
`1931`	`1935`
`1932`	`1936`	`/*`
`@@ -1971,10 +1975,7 @@ CommitTransaction(void)`
`1971`	`1975`
`1972`	`1976`	`/* If we might have parallel workers, clean them up now. */`
`1973`	`1977`	`if (IsInParallelMode())`
`1974`		`-{`
`1975`	`1978`	`AtEOXact_Parallel(true);`
`1976`		`-s->parallelModeLevel=0;`
`1977`		`-}`
`1978`	`1979`
`1979`	`1980`	`/* Shut down the deferred-trigger manager */`
`1980`	`1981`	`AfterTriggerEndXact(true);`
`@@ -2013,6 +2014,7 @@ CommitTransaction(void)`
`2013`	`2014`	`* commit processing`
`2014`	`2015`	`*/`
`2015`	`2016`	`s->state=TRANS_COMMIT;`
	`2017`	`+s->parallelModeLevel=0;`
`2016`	`2018`
`2017`	`2019`	`if (!is_parallel_worker)`
`2018`	`2020`	`{`

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!

Commit94b4f7e

File tree

1 file changed

1 file changed

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

0 commit comments