Fix crash when canceling parallel query

elog(FATAL) would end up calling PortalCleanup(), which would call
executor shutdown code, which could fail and crash, especially under
parallel query.  This was introduced by
8561e4840c, which did not want to mark an
active portal as failed by a normal transaction abort anymore.  But we
do need to do that for an elog(FATAL) exit.  Introduce a variable
shmem_exit_inprogress similar to the existing proc_exit_inprogress, so
we can tell whether we are in the FATAL exit scenario.

Reported-by: Andres Freund <andres@anarazel.de>
This commit is contained in:
Peter Eisentraut 2018-02-01 17:07:38 -05:00
parent 49bff412ed
commit ad9a274778
3 changed files with 16 additions and 0 deletions

View File

@ -39,6 +39,11 @@
*/
bool proc_exit_inprogress = false;
/*
* Set when shmem_exit() is in progress.
*/
bool shmem_exit_inprogress = false;
/*
* This flag tracks whether we've called atexit() in the current process
* (or in the parent postmaster).
@ -214,6 +219,8 @@ proc_exit_prepare(int code)
void
shmem_exit(int code)
{
shmem_exit_inprogress = true;
/*
* Call before_shmem_exit callbacks.
*

View File

@ -22,6 +22,7 @@
#include "catalog/pg_type.h"
#include "commands/portalcmds.h"
#include "miscadmin.h"
#include "storage/ipc.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
@ -757,6 +758,13 @@ AtAbort_Portals(void)
{
Portal portal = hentry->portal;
/*
* When elog(FATAL) is progress, we need to set the active portal to
* failed, so that PortalCleanup() doesn't run the executor shutdown.
*/
if (portal->status == PORTAL_ACTIVE && shmem_exit_inprogress)
MarkPortalFailed(portal);
/*
* Do nothing else to cursors held over from a previous transaction.
*/

View File

@ -63,6 +63,7 @@ typedef void (*shmem_startup_hook_type) (void);
/* ipc.c */
extern PGDLLIMPORT bool proc_exit_inprogress;
extern PGDLLIMPORT bool shmem_exit_inprogress;
extern void proc_exit(int code) pg_attribute_noreturn();
extern void shmem_exit(int code);