NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitad9a274

committed

Fix crash when canceling parallel query

elog(FATAL) would end up calling PortalCleanup(), which would callexecutor shutdown code, which could fail and crash, especially underparallel query. This was introduced by8561e48, which did not want to mark anactive portal as failed by a normal transaction abort anymore. But wedo need to do that for an elog(FATAL) exit. Introduce a variableshmem_exit_inprogress similar to the existing proc_exit_inprogress, sowe can tell whether we are in the FATAL exit scenario.Reported-by: Andres Freund <andres@anarazel.de>

1 parent49bff41 commitad9a274Copy full SHA for ad9a274

File tree

3 files changed

+16

-0

lines changed

src
- backend
  - storage/ipc
    - ipc.c
  - utils/mmgr
    - portalmem.c
- include/storage
  - ipc.h

3 files changed

+16

-0

lines changed

`‎src/backend/storage/ipc/ipc.c`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,11 @@`
`39`	`39`	`*/`
`40`	`40`	`boolproc_exit_inprogress= false;`
`41`	`41`
	`42`	`+/*`
	`43`	`+ * Set when shmem_exit() is in progress.`
	`44`	`+ */`
	`45`	`+boolshmem_exit_inprogress= false;`
	`46`	`+`
`42`	`47`	`/*`
`43`	`48`	`* This flag tracks whether we've called atexit() in the current process`
`44`	`49`	`* (or in the parent postmaster).`
`@@ -214,6 +219,8 @@ proc_exit_prepare(int code)`
`214`	`219`	`void`
`215`	`220`	`shmem_exit(intcode)`
`216`	`221`	`{`
	`222`	`+shmem_exit_inprogress= true;`
	`223`	`+`
`217`	`224`	`/*`
`218`	`225`	`* Call before_shmem_exit callbacks.`
`219`	`226`	`*`

`‎src/backend/utils/mmgr/portalmem.c`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include"catalog/pg_type.h"`
`23`	`23`	`#include"commands/portalcmds.h"`
`24`	`24`	`#include"miscadmin.h"`
	`25`	`+#include"storage/ipc.h"`
`25`	`26`	`#include"utils/builtins.h"`
`26`	`27`	`#include"utils/memutils.h"`
`27`	`28`	`#include"utils/snapmgr.h"`
`@@ -757,6 +758,13 @@ AtAbort_Portals(void)`
`757`	`758`	`{`
`758`	`759`	`Portalportal=hentry->portal;`
`759`	`760`
	`761`	`+/*`
	`762`	`+ * When elog(FATAL) is progress, we need to set the active portal to`
	`763`	`+ * failed, so that PortalCleanup() doesn't run the executor shutdown.`
	`764`	`+ */`
	`765`	`+if (portal->status==PORTAL_ACTIVE&&shmem_exit_inprogress)`
	`766`	`+MarkPortalFailed(portal);`
	`767`	`+`
`760`	`768`	`/*`
`761`	`769`	`* Do nothing else to cursors held over from a previous transaction.`
`762`	`770`	`*/`

`‎src/include/storage/ipc.h`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ typedef void (*shmem_startup_hook_type) (void);`
`63`	`63`
`64`	`64`	`/* ipc.c */`
`65`	`65`	`externPGDLLIMPORTboolproc_exit_inprogress;`
	`66`	`+externPGDLLIMPORTboolshmem_exit_inprogress;`
`66`	`67`
`67`	`68`	`externvoidproc_exit(intcode)pg_attribute_noreturn();`
`68`	`69`	`externvoidshmem_exit(intcode);`

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!

Commitad9a274

File tree

3 files changed

3 files changed

`‎src/backend/storage/ipc/ipc.c`

`‎src/backend/utils/mmgr/portalmem.c`

`‎src/include/storage/ipc.h`

0 commit comments