mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call pgstat_report_activity() in parallel CREATE INDEX workers.

Browse Source 
Also set debug_query_string.

Oversight in commit 9da0cc35284bdbe8d442d732963303ff0e0a40bc

Peter Geoghegan, per a report by Phil Florent.

Discussion: https://postgr.es/m/CAH2-Wzmf-34hD4n40uTuE-ZY9P5c%2BmvhFbCdQfN%3DKrKiVm3j3A%40mail.gmail.com
This commit is contained in:
Robert Haas 2018-03-22 13:15:03 -04:00
parent c35b472869
commit 7de4a1bcc5
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/access/nbtree/nbtsort.c
View File

@ -86,6 +86,7 @@
#define PARALLEL_KEY_BTREE_SHARED UINT64CONST(0xA000000000000001) #define PARALLEL_KEY_BTREE_SHARED UINT64CONST(0xA000000000000001)
#define PARALLEL_KEY_TUPLESORT UINT64CONST(0xA000000000000002) #define PARALLEL_KEY_TUPLESORT UINT64CONST(0xA000000000000002)
#define PARALLEL_KEY_TUPLESORT_SPOOL2 UINT64CONST(0xA000000000000003) #define PARALLEL_KEY_TUPLESORT_SPOOL2 UINT64CONST(0xA000000000000003)
#define PARALLEL_KEY_QUERY_TEXT UINT64CONST(0xA000000000000004)
/* /*
* DISABLE_LEADER_PARTICIPATION disables the leader's participation in * DISABLE_LEADER_PARTICIPATION disables the leader's participation in
@ -1195,6 +1196,8 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
BTSpool *btspool = buildstate->spool; BTSpool *btspool = buildstate->spool;
BTLeader *btleader = (BTLeader *) palloc0(sizeof(BTLeader)); BTLeader *btleader = (BTLeader *) palloc0(sizeof(BTLeader));
bool leaderparticipates = true; bool leaderparticipates = true;
char *sharedquery;
int querylen;
#ifdef DISABLE_LEADER_PARTICIPATION #ifdef DISABLE_LEADER_PARTICIPATION
leaderparticipates = false; leaderparticipates = false;
@ -1223,9 +1226,8 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
snapshot = RegisterSnapshot(GetTransactionSnapshot()); snapshot = RegisterSnapshot(GetTransactionSnapshot());
/* /*
* Estimate size for at least two keys -- our own * Estimate size for our own PARALLEL_KEY_BTREE_SHARED workspace, and
* PARALLEL_KEY_BTREE_SHARED workspace, and PARALLEL_KEY_TUPLESORT * PARALLEL_KEY_TUPLESORT tuplesort workspace
* tuplesort workspace
*/ */
estbtshared = _bt_parallel_estimate_shared(snapshot); estbtshared = _bt_parallel_estimate_shared(snapshot);
shm_toc_estimate_chunk(&pcxt->estimator, estbtshared); shm_toc_estimate_chunk(&pcxt->estimator, estbtshared);
@ -1234,7 +1236,7 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
/* /*
* Unique case requires a second spool, and so we may have to account for * Unique case requires a second spool, and so we may have to account for
* a third shared workspace -- PARALLEL_KEY_TUPLESORT_SPOOL2 * another shared workspace for that -- PARALLEL_KEY_TUPLESORT_SPOOL2
*/ */
if (!btspool->isunique) if (!btspool->isunique)
shm_toc_estimate_keys(&pcxt->estimator, 2); shm_toc_estimate_keys(&pcxt->estimator, 2);
@ -1244,6 +1246,11 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
shm_toc_estimate_keys(&pcxt->estimator, 3); shm_toc_estimate_keys(&pcxt->estimator, 3);
} }
/* Finally, estimate PARALLEL_KEY_QUERY_TEXT space */
querylen = strlen(debug_query_string);
shm_toc_estimate_chunk(&pcxt->estimator, querylen + 1);
shm_toc_estimate_keys(&pcxt->estimator, 1);
/* Everyone's had a chance to ask for space, so now create the DSM */ /* Everyone's had a chance to ask for space, so now create the DSM */
InitializeParallelDSM(pcxt); InitializeParallelDSM(pcxt);
@ -1293,6 +1300,11 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
shm_toc_insert(pcxt->toc, PARALLEL_KEY_TUPLESORT_SPOOL2, sharedsort2); shm_toc_insert(pcxt->toc, PARALLEL_KEY_TUPLESORT_SPOOL2, sharedsort2);
} }
/* Store query string for workers */
sharedquery = (char *) shm_toc_allocate(pcxt->toc, querylen + 1);
memcpy(sharedquery, debug_query_string, querylen + 1);
shm_toc_insert(pcxt->toc, PARALLEL_KEY_QUERY_TEXT, sharedquery);
/* Launch workers, saving status for leader/caller */ /* Launch workers, saving status for leader/caller */
LaunchParallelWorkers(pcxt); LaunchParallelWorkers(pcxt);
btleader->pcxt = pcxt; btleader->pcxt = pcxt;
@ -1459,6 +1471,7 @@ _bt_leader_participate_as_worker(BTBuildState *buildstate)
void void
_bt_parallel_build_main(dsm_segment *seg, shm_toc *toc) _bt_parallel_build_main(dsm_segment *seg, shm_toc *toc)
{ {
char *sharedquery;
BTSpool *btspool; BTSpool *btspool;
BTSpool *btspool2; BTSpool *btspool2;
BTShared *btshared; BTShared *btshared;
@ -1475,7 +1488,14 @@ _bt_parallel_build_main(dsm_segment *seg, shm_toc *toc)
ResetUsage(); ResetUsage();
#endif /* BTREE_BUILD_STATS */ #endif /* BTREE_BUILD_STATS */
/* Look up shared state */ /* Set debug_query_string for individual workers first */
sharedquery = shm_toc_lookup(toc, PARALLEL_KEY_QUERY_TEXT, false);
debug_query_string = sharedquery;
/* Report the query string from leader */
pgstat_report_activity(STATE_RUNNING, debug_query_string);
/* Look up nbtree shared state */
btshared = shm_toc_lookup(toc, PARALLEL_KEY_BTREE_SHARED, false); btshared = shm_toc_lookup(toc, PARALLEL_KEY_BTREE_SHARED, false);
/* Open relations using lock modes known to be obtained by index.c */ /* Open relations using lock modes known to be obtained by index.c */