remove incorrect Assert, handle XACT_EVENT_PARALLEL_ABORT

funbringer · funbringer · commit 83cd0217cbd7 · 2016-07-18T13:10:15.000+03:00
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -180,7 +180,6 @@ remove_on_xact_abort_callbacks(void *arg)
 	else
 		UnregisterSubXactCallback(on_subxact_abort_callback, arg);
 
-	Assert(parg->expired == true); /* the job should always be done */
 	pfree(arg);
 }
 
@@ -223,7 +222,8 @@ on_xact_abort_callback(XactEvent event, void *arg)
 	part_abort_arg *parg = (part_abort_arg *) arg;
 
 	/* Check that this is an aborted Xact & action has not expired yet */
-	if (event == XACT_EVENT_ABORT && !parg->expired)
+	if ((event == XACT_EVENT_ABORT || event == XACT_EVENT_PARALLEL_ABORT) &&
+		!parg->expired)
 	{
 		handle_part_event_cancellation(parg);
 

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_arg parg = (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`