Commit 6c878a75 authored by Robert Haas's avatar Robert Haas

Avoid server crash when worker registration fails at execution time.

The previous coding attempts to destroy the DSM in this case, but
child nodes might have stored data there and still be holding onto
pointers in this case.  So don't do that.

Also, free the reader array instead of leaking it.

Extracted from two different patch versions both by Amit Kapila.
parent 74d0d5f3
......@@ -190,7 +190,7 @@ ExecGather(GatherState *node)
/* No workers? Then never mind. */
if (!got_any_worker)
ExecShutdownGather(node);
ExecShutdownGatherWorkers(node);
}
/* Run plan locally if no workers or not single-copy. */
......@@ -402,6 +402,8 @@ ExecShutdownGatherWorkers(GatherState *node)
for (i = 0; i < node->nreaders; ++i)
DestroyTupleQueueReader(node->reader[i]);
pfree(node->reader);
node->reader = NULL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment