Merge branch 'master' into picky_nodes

funbringer · funbringer · commit b303f6c2bc92 · 2016-07-18T14:06:29.000+03:00
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -176,7 +176,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);
 }
 
@@ -219,7 +218,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
`@@ -176,7 +176,6 @@ remove_on_xact_abort_callbacks(void *arg)`
`176`	`176`	`else`
`177`	`177`	`UnregisterSubXactCallback(on_subxact_abort_callback, arg);`
`178`	`178`
`179`		`- Assert(parg->expired == true); /* the job should always be done */`
`180`	`179`	`pfree(arg);`
`181`	`180`	`}`
`182`	`181`
`@@ -219,7 +218,8 @@ on_xact_abort_callback(XactEvent event, void *arg)`
`219`	`218`	`part_abort_arg parg = (part_abort_arg ) arg;`
`220`	`219`
`221`	`220`	`/* Check that this is an aborted Xact & action has not expired yet */`
`222`		`- if (event == XACT_EVENT_ABORT && !parg->expired)`
	`221`	`+ if ((event == XACT_EVENT_ABORT \|\| event == XACT_EVENT_PARALLEL_ABORT) &&`
	`222`	`+ !parg->expired)`
`223`	`223`	`{`
`224`	`224`	`handle_part_event_cancellation(parg);`
`225`	`225`