1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ReinitializeParallelDSM to tolerate finding no error queues.

Browse Source 
Commit d4663350646ca0c069a36d906155a0f7e3372eb7 changed things so
that shm_toc_lookup would fail with an error rather than silently
returning NULL in the hope that such failures would be reported
in a useful way rather than via a system crash.  However, it
overlooked the fact that the lookup of PARALLEL_KEY_ERROR_QUEUE
in ReinitializeParallelDSM is expected to fail when no DSM segment
was created in the first place; in that case, we end up with a
backend-private memory segment that still contains an entry for
PARALLEL_KEY_FIXED but no others.  Consequently a benign failure
to initialize parallelism can escalate into an elog(ERROR);
repair.

Discussion: http://postgr.es/m/CA+Tgmob8LFw55DzH1QEREpBEA9RJ_W_amhBFCVZ6WMwUhVpOqg@mail.gmail.com
This commit is contained in:
Robert Haas 2017-11-28 12:05:52 -05:00
parent ec7629dfb9
commit dba6e75c11
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/access/transam/parallel.c
View File

@ -399,9 +399,10 @@ ReinitializeParallelDSM(ParallelContext *pcxt)
fps = shm_toc_lookup(pcxt->toc, PARALLEL_KEY_FIXED, false); fps = shm_toc_lookup(pcxt->toc, PARALLEL_KEY_FIXED, false);
fps->last_xlog_end = 0; fps->last_xlog_end = 0;
/* Recreate error queues. */ /* Recreate error queues (if they exist). */
error_queue_space = error_queue_space =
shm_toc_lookup(pcxt->toc, PARALLEL_KEY_ERROR_QUEUE, false); shm_toc_lookup(pcxt->toc, PARALLEL_KEY_ERROR_QUEUE, true);
Assert(pcxt->nworkers == 0 || error_queue_space != NULL);
for (i = 0; i < pcxt->nworkers; ++i) for (i = 0; i < pcxt->nworkers; ++i)
{ {
char *start; char *start;