aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/execParallel.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2017-01-05 12:27:09 -0500
committerRobert Haas <rhaas@postgresql.org>2017-01-05 12:27:09 -0500
commit175ff6598e014b2fe84c06fa443161294fc2eed0 (patch)
treedd690b09d8b6a8cce138a4c988446c5aab1254bd /src/backend/executor/execParallel.c
parent82f8107b92c9104ec9d9465f3f6a4c6dab4c124a (diff)
downloadpostgresql-175ff6598e014b2fe84c06fa443161294fc2eed0.tar.gz
postgresql-175ff6598e014b2fe84c06fa443161294fc2eed0.zip
Fix possible crash reading pg_stat_activity.
With the old code, a backend that read pg_stat_activity without ever having executed a parallel query might see a backend in the midst of executing one waiting on a DSA LWLock, resulting in a crash. The solution is for backends to register the tranche at startup time, not the first time a parallel query is executed. Report by Andreas Seltenreich. Patch by me, reviewed by Thomas Munro.
Diffstat (limited to 'src/backend/executor/execParallel.c')
-rw-r--r--src/backend/executor/execParallel.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 821f3e9a97b..86d9fb59ba6 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -486,7 +486,6 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
shm_toc_insert(pcxt->toc, PARALLEL_KEY_DSA, area_space);
pei->area = dsa_create_in_place(area_space, dsa_minsize,
LWTRANCHE_PARALLEL_QUERY_DSA,
- "parallel_query_dsa",
pcxt->seg);
}