diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2023-11-23 13:31:36 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2023-11-23 13:31:36 +0200 |
| commit | 50c67c2019ab9ade8aa8768bfe604cd802fe8591 (patch) | |
| tree | 9dcc8f840dea2de613efaa2bddb1206e8bb1d33c /src/backend/executor/nodeAppend.c | |
| parent | 414e75540f058b23377219586abb3008507f7099 (diff) | |
| download | postgresql-50c67c2019ab9ade8aa8768bfe604cd802fe8591.tar.gz postgresql-50c67c2019ab9ade8aa8768bfe604cd802fe8591.zip | |
Use ResourceOwner to track WaitEventSets.
A WaitEventSet holds file descriptors or event handles (on Windows).
If FreeWaitEventSet is not called, those fds or handles are leaked.
Use ResourceOwners to track WaitEventSets, to clean those up
automatically on error.
This was a live bug in async Append nodes, if a FDW's
ForeignAsyncRequest function failed. (In back branches, I will apply a
more localized fix for that based on PG_TRY-PG_FINALLY.)
The added test doesn't check for leaking resources, so it passed even
before this commit. But at least it covers the code path.
In the passing, fix misleading comment on what the 'nevents' argument
to WaitEventSetWait means.
Report by Alexander Lakhin, analysis and suggestion for the fix by
Tom Lane. Fixes bug #17828.
Reviewed-by: Alexander Lakhin, Thomas Munro
Discussion: https://www.postgresql.org/message-id/472235.1678387869@sss.pgh.pa.us
Diffstat (limited to 'src/backend/executor/nodeAppend.c')
| -rw-r--r-- | src/backend/executor/nodeAppend.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 609df6b9e62..af8e37205f2 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -1025,7 +1025,8 @@ ExecAppendAsyncEventWait(AppendState *node) /* We should never be called when there are no valid async subplans. */ Assert(node->as_nasyncremain > 0); - node->as_eventset = CreateWaitEventSet(CurrentMemoryContext, nevents); + Assert(node->as_eventset == NULL); + node->as_eventset = CreateWaitEventSet(CurrentResourceOwner, nevents); AddWaitEventToSet(node->as_eventset, WL_EXIT_ON_PM_DEATH, PGINVALID_SOCKET, NULL, NULL); @@ -1050,7 +1051,7 @@ ExecAppendAsyncEventWait(AppendState *node) return; } - /* We wait on at most EVENT_BUFFER_SIZE events. */ + /* Return at most EVENT_BUFFER_SIZE events in one call. */ if (nevents > EVENT_BUFFER_SIZE) nevents = EVENT_BUFFER_SIZE; |