Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(gatsby): wait for LMDB upserts to finish before emitting ENGINES_READY #34853

Merged
merged 9 commits into from
Feb 21, 2022
Merged

fix(gatsby): wait for LMDB upserts to finish before emitting ENGINES_READY #34853

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab55086
start materializing page mode sooner, wait for it to finish before em…
pieh Feb 18, 2022
4b1a3f4
checksum
pieh Feb 18, 2022
9e4bb08
toggle page mode materialization with env var
pieh Feb 18, 2022
7fbbab6
move checksum comparison
pieh Feb 18, 2022
6dcd175
drop unneeded @ts-ignore
pieh Feb 19, 2022
0da6f92
drop GATSBY_MATERIALIZE_EARLY
pieh Feb 19, 2022
d86fcaa
drop checksum
pieh Feb 21, 2022
a1c0bf6
non-pqr match pqr - materialize first, queries later
pieh Feb 21, 2022
2d2f2f9
single start of materialization
pieh Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/gatsby/src/commands/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,13 @@ module.exports = async function build(
)
}

// Start saving page.mode in the main process (while queries run in workers in parallel)
let waitMaterializePageMode = Promise.resolve()

let waitForWorkerPoolRestart = Promise.resolve()
if (process.env.GATSBY_EXPERIMENTAL_PARALLEL_QUERY_RUNNING) {
waitMaterializePageMode = materializePageMode()

await runQueriesInWorkersQueue(workerPool, queryIds, {
parentSpan: buildSpan,
})
Expand All @@ -297,6 +302,8 @@ module.exports = async function build(
waitForWorkerPoolRestart = workerPool.restart()
await mergeWorkerState(workerPool, buildSpan)
} else {
waitMaterializePageMode = materializePageMode()

await runStaticQueries({
queryIds,
parentSpan: buildSpan,
Expand All @@ -322,6 +329,7 @@ module.exports = async function build(
}

if (process.send && shouldGenerateEngines()) {
await waitMaterializePageMode
process.send({
type: `LOG_ACTION`,
action: {
Expand Down Expand Up @@ -401,9 +409,6 @@ module.exports = async function build(

await waitForWorkerPoolRestart

// Start saving page.mode in the main process (while HTML is generated in workers in parallel)
const waitMaterializePageMode = materializePageMode()

const { toRegenerate, toDelete } =
await buildHTMLPagesAndDeleteStaleArtifacts({
program,
Expand Down
2 changes: 2 additions & 0 deletions packages/gatsby/src/utils/page-mode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
import { reportOnce } from "./report-once"
import { ROUTES_DIRECTORY } from "../constants"
import { Runner } from "../bootstrap/create-graphql-runner"
import { getDataStore } from "../datastore"

type IPageConfigFn = (arg: { params: Record<string, unknown> }) => {
defer: boolean
Expand Down Expand Up @@ -111,6 +112,7 @@ export async function materializePageMode(): Promise<void> {
await new Promise(resolve => setImmediate(resolve))
}
}
await getDataStore().ready()
}

export async function preparePageTemplateConfigs(
Expand Down