Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 840eda0

Browse files
committed
Hold interrupts while running dsm_detach() callbacks.
While cleaning up after a parallel query or parallel index creation that created temporary files, we could be interrupted by a statement timeout. The error handling path would then fail to clean up the files when it ran dsm_detach() again, because the callback was already popped off the list. Prevent this hazard by holding interrupts while the cleanup code runs. Thanks to Heikki Linnakangas for this suggestion, and also to Kyotaro Horiguchi, Masahiko Sawada, Justin Pryzby and Tom Lane for discussion of this 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 parent c3dc311 commit 840eda0

File tree

1 file changed

+6
-1
lines changed
  • src/backend/storage/ipc

1 file changed

+6
-1
lines changed

src/backend/storage/ipc/dsm.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,12 @@ dsm_detach(dsm_segment *seg)
660660
/*
661661
* Invoke registered callbacks. Just in case one of those callbacks
662662
* 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.
664667
*/
668+
HOLD_INTERRUPTS();
665669
while (!slist_is_empty(&seg->on_detach))
666670
{
667671
slist_node *node;
@@ -677,6 +681,7 @@ dsm_detach(dsm_segment *seg)
677681

678682
function(seg, arg);
679683
}
684+
RESUME_INTERRUPTS();
680685

681686
/*
682687
* Try to remove the mapping, if one exists. Normally, there will be, but

0 commit comments

Comments
 (0)