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

diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 52f1a96db5faf24c7c954a9f7182a8929c2e0511..ee0f07a81e97305d89db9abd6ba49713659b904f 100644 (file)
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -1281,9 +1281,6 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
        /* Report workers' query for monitoring purposes */
        pgstat_report_activity(STATE_RUNNING, debug_query_string);
 
-       /* Prepare to track buffer usage during query execution. */
-       InstrStartParallelQuery();
-
        /* Attach to the dynamic shared memory area. */
        area_space = shm_toc_lookup(toc, PARALLEL_KEY_DSA, false);
        area = dsa_attach_in_place(area_space, seg);
@@ -1309,6 +1306,15 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
        /* Pass down any tuple bound */
        ExecSetTupleBound(fpes->tuples_needed, queryDesc->planstate);
 
+       /*
+        * 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();
+
        /*
         * Run the plan.  If we specified a tuple bound, be careful not to demand
         * more tuples than that.