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): assign correct parentSpans to PQR activities #33568

Merged
merged 1 commit into from
Oct 18, 2021
Merged

fix(gatsby): assign correct parentSpans to PQR activities #33568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 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 @@ -221,7 +221,7 @@ module.exports = async function build(program: IBuildArgs): Promise<void> {
}

const cacheActivity = report.activityTimer(`Caching Webpack compilations`, {
parentSpan: buildActivityTimer.span,
parentSpan: buildSpan,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildActivityTimer (activity for browser bundling) would finish before it, so that parentSpan was incorrect

})
try {
cacheActivity.start()
Expand Down Expand Up @@ -249,12 +249,14 @@ module.exports = async function build(program: IBuildArgs): Promise<void> {

let waitForWorkerPoolRestart = Promise.resolve()
if (process.env.GATSBY_EXPERIMENTAL_PARALLEL_QUERY_RUNNING) {
await runQueriesInWorkersQueue(workerPool, queryIds)
await runQueriesInWorkersQueue(workerPool, queryIds, {
parentSpan: buildSpan,
})
// Jobs still might be running even though query running finished
await waitUntilAllJobsComplete()
// Restart worker pool before merging state to lower memory pressure while merging state
waitForWorkerPoolRestart = workerPool.restart()
await mergeWorkerState(workerPool)
await mergeWorkerState(workerPool, buildSpan)
} else {
await runStaticQueries({
queryIds,
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby/src/utils/worker/__tests__/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ describeWhenLMDB(`worker (queries)`, () => {
const spy = jest.spyOn(worker.single, `runQueries`)

// @ts-ignore - worker is defined
await runQueriesInWorkersQueue(worker, queryIdsBig, 10)
await runQueriesInWorkersQueue(worker, queryIdsBig, { chunkSize: 10 })
const stateFromWorker = await worker.single.getState()

// Called the complete ABC so we can test _a
Expand Down
27 changes: 21 additions & 6 deletions packages/gatsby/src/utils/worker/pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { WorkerPool } from "gatsby-worker"
import { chunk } from "lodash"
import reporter from "gatsby-cli/lib/reporter"
import { cpuCoreCount } from "gatsby-core-utils"
import { Span } from "opentracing"

import { IGroupedQueryIds } from "../../services"
import { initJobsMessagingInMainProcess } from "../jobs/worker-messaging"
Expand Down Expand Up @@ -46,16 +47,27 @@ function handleRunQueriesInWorkersQueueError(e: Error): never {
export async function runQueriesInWorkersQueue(
pool: GatsbyWorkerPool,
queryIds: IGroupedQueryIds,
chunkSize = queriesChunkSize
opts?: {
chunkSize?: number
parentSpan?: Span
}
): Promise<void> {
const activity = reporter.createProgress(
`run queries in workers`,
queryIds.staticQueryIds.length + queryIds.pageQueryIds.length
queryIds.staticQueryIds.length + queryIds.pageQueryIds.length,
0,
{ parentSpan: opts?.parentSpan }
)
activity.start()
try {
const staticQuerySegments = chunk(queryIds.staticQueryIds, chunkSize)
const pageQuerySegments = chunk(queryIds.pageQueryIds, chunkSize)
const staticQuerySegments = chunk(
queryIds.staticQueryIds,
opts?.chunkSize ?? queriesChunkSize
)
const pageQuerySegments = chunk(
queryIds.pageQueryIds,
opts?.chunkSize ?? queriesChunkSize
)

pool.all.setComponents()

Expand Down Expand Up @@ -90,8 +102,11 @@ export async function runQueriesInWorkersQueue(
}
}

export async function mergeWorkerState(pool: GatsbyWorkerPool): Promise<void> {
const activity = reporter.activityTimer(`Merge worker state`)
export async function mergeWorkerState(
pool: GatsbyWorkerPool,
parentSpan?: Span
): Promise<void> {
const activity = reporter.activityTimer(`Merge worker state`, { parentSpan })
activity.start()

for (const { workerId } of pool.getWorkerInfo()) {
Expand Down