From 2242c6719c81552cf7bceaedcdbde759600d0973 Mon Sep 17 00:00:00 2001 From: Matthias van de Meent Date: Thu, 30 Nov 2023 18:19:40 +0100 Subject: [PATCH v8 3/6] BRIN: Exit parallel mode when not starting parallel create index --- src/backend/access/brin/brin.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index edf2daad0c3..bc519825f2e 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -2506,8 +2506,12 @@ _brin_end_parallel(BrinLeader *brinleader, BrinBuildState *state) /* Shutdown worker processes */ WaitForParallelWorkersToFinish(brinleader->pcxt); + /* + * If we didn't actually launch workers, we still have to make sure to exit + * parallel mode. + */ if (!state) - return; + goto cleanup; /* copy the data into leader state (we have to wait for the workers ) */ state->bs_reltuples = brinshared->reltuples; @@ -2691,6 +2695,8 @@ _brin_end_parallel(BrinLeader *brinleader, BrinBuildState *state) for (i = 0; i < brinleader->pcxt->nworkers_launched; i++) InstrAccumParallelQuery(&brinleader->bufferusage[i], &brinleader->walusage[i]); +cleanup: + /* Free last reference to MVCC snapshot, if one was used */ if (IsMVCCSnapshot(brinleader->snapshot)) UnregisterSnapshot(brinleader->snapshot); -- 2.41.0