Commit83cd021

committed

remove incorrect Assert, handle XACT_EVENT_PARALLEL_ABORT

1 parenta333938 commit83cd021Copy full SHA for 83cd021

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ remove_on_xact_abort_callbacks(void *arg)`
`180`	`180`	`else`
`181`	`181`	`UnregisterSubXactCallback(on_subxact_abort_callback,arg);`
`182`	`182`
`183`		`-Assert(parg->expired== true);/* the job should always be done */`
`184`	`183`	`pfree(arg);`
`185`	`184`	`}`
`186`	`185`
`@@ -223,7 +222,8 @@ on_xact_abort_callback(XactEvent event, void *arg)`
`223`	`222`	`part_abort_argparg= (part_abort_arg)arg;`
`224`	`223`
`225`	`224`	`/* Check that this is an aborted Xact & action has not expired yet */`
`226`		`-if (event==XACT_EVENT_ABORT&& !parg->expired)`
	`225`	`+if ((event==XACT_EVENT_ABORT\|\|event==XACT_EVENT_PARALLEL_ABORT)&&`
	`226`	`+!parg->expired)`
`227`	`227`	`{`
`228`	`228`	`handle_part_event_cancellation(parg);`
`229`	`229`

Comments

(0)