Skip to content
Snippets Groups Projects
Commit 7124c93f authored by Amit Kapila's avatar Amit Kapila
Browse files

Match the buffer usage tracking for leader and worker backends.

In the leader backend, we don't track the buffer usage for ExecutorStart
phase whereas in worker backend we track it for ExecutorStart phase as
well.  This leads to different value for buffer usage stats for the
parallel and non-parallel query.  Change the code so that worker backend
also starts tracking buffer usage after ExecutorStart.

Author: Amit Kapila and Robert Haas
Reviewed-by: Robert Haas and Andres Freund
Backpatch-through: 9.6 where this code was introduced
Discussion: https://postgr.es/m/86137f17-1dfb-42f9-7421-82fd786b04a1@anayrat.info
parent 764e21db
No related branches found
No related tags found
No related merge requests found
...@@ -735,12 +735,19 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc) ...@@ -735,12 +735,19 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
instrument_options = instrumentation->instrument_options; instrument_options = instrumentation->instrument_options;
queryDesc = ExecParallelGetQueryDesc(toc, receiver, instrument_options); queryDesc = ExecParallelGetQueryDesc(toc, receiver, instrument_options);
/* Prepare to track buffer usage during query execution. */
InstrStartParallelQuery();
/* Start up the executor, have it run the plan, and then shut it down. */ /* Start up the executor, have it run the plan, and then shut it down. */
ExecutorStart(queryDesc, 0); ExecutorStart(queryDesc, 0);
ExecParallelInitializeWorker(queryDesc->planstate, toc); ExecParallelInitializeWorker(queryDesc->planstate, toc);
/*
* Prepare to track buffer usage during query execution.
*
* We do this after starting up the executor to match what happens in the
* leader, which also doesn't count buffer accesses that occur during
* executor startup.
*/
InstrStartParallelQuery();
ExecutorRun(queryDesc, ForwardScanDirection, 0L); ExecutorRun(queryDesc, ForwardScanDirection, 0L);
ExecutorFinish(queryDesc); ExecutorFinish(queryDesc);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment