NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit9fe4091

committed

Hold interrupts while running dsm_detach() callbacks.

While cleaning up after a parallel query or parallel index creation thatcreated temporary files, we could be interrupted by a statement timeout.The error handling path would then fail to clean up the files when itran dsm_detach() again, because the callback was already popped off thelist. Prevent this hazard by holding interrupts while the cleanup coderuns.Thanks to Heikki Linnakangas for this suggestion, and also to KyotaroHoriguchi, Masahiko Sawada, Justin Pryzby and Tom Lane for discussion ofthis and earlier ideas on how to fix the problem.Back-patch to all supported releases.Reported-by: Justin Pryzby <pryzby@telsasoft.com>Discussion:https://postgr.es/m/20191212180506.GR2082@telsasoft.com

1 parentc86eae3 commit9fe4091Copy full SHA for 9fe4091

File tree

1 file changed

-1

lines changed

src/backend/storage/ipc
- dsm.c

1 file changed

-1

lines changed

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

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -660,8 +660,12 @@ dsm_detach(dsm_segment *seg)`
`660`	`660`	`/*`
`661`	`661`	`* Invoke registered callbacks. Just in case one of those callbacks`
`662`	`662`	`* throws a further error that brings us back here, pop the callback`
`663`		`- * before invoking it, to avoid infinite error recursion.`
	`663`	`+ * before invoking it, to avoid infinite error recursion. Don't allow`
	`664`	`+ * interrupts while running the individual callbacks in non-error code`
	`665`	`+ * paths, to avoid leaving cleanup work unfinished if we're interrupted by`
	`666`	`+ * a statement timeout or similar.`
`664`	`667`	`*/`
	`668`	`+HOLD_INTERRUPTS();`
`665`	`669`	`while (!slist_is_empty(&seg->on_detach))`
`666`	`670`	`{`
`667`	`671`	`slist_node*node;`
`@@ -677,6 +681,7 @@ dsm_detach(dsm_segment *seg)`
`677`	`681`
`678`	`682`	`function(seg,arg);`
`679`	`683`	`}`
	`684`	`+RESUME_INTERRUPTS();`
`680`	`685`
`681`	`686`	`/*`
`682`	`687`	`* Try to remove the mapping, if one exists. Normally, there will be, but`

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!

Commit9fe4091

File tree

1 file changed

1 file changed

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

0 commit comments