Unverified Commit df2c4a30 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

ensure webpack worker exits bubble to parent process (#72921)

This matches the handling added in #70997 but for the Webpack build
worker. This unifies the worker code to be the same as the one for the
static export worker which already handles this case.

When the worker exits ungracefully, we need to propagate an error signal
to the parent process so that it doesn't hang.

Fixes #67097
Closes NDX-485
Closes #67154
parent dacf6d8d
...@@ -2,9 +2,8 @@ import type { COMPILER_INDEXES } from '../../shared/lib/constants' ...@@ -2,9 +2,8 @@ import type { COMPILER_INDEXES } from '../../shared/lib/constants'
import * as Log from '../output/log' import * as Log from '../output/log'
import { NextBuildContext } from '../build-context' import { NextBuildContext } from '../build-context'
import type { BuildTraceContext } from '../webpack/plugins/next-trace-entrypoints-plugin' import type { BuildTraceContext } from '../webpack/plugins/next-trace-entrypoints-plugin'
import { Worker } from 'next/dist/compiled/jest-worker' import { Worker } from '../../lib/worker'
import origDebug from 'next/dist/compiled/debug' import origDebug from 'next/dist/compiled/debug'
import type { ChildProcess } from 'child_process'
import path from 'path' import path from 'path'
import { exportTraceState, recordTraceEvents } from '../../trace' import { exportTraceState, recordTraceEvents } from '../../trace'
...@@ -38,35 +37,17 @@ async function webpackBuildWithWorker( ...@@ -38,35 +37,17 @@ async function webpackBuildWithWorker(
prunedBuildContext.pluginState = pluginState prunedBuildContext.pluginState = pluginState
const getWorker = (compilerName: string) => { const worker = new Worker(path.join(__dirname, 'impl.js'), {
const _worker = new Worker(path.join(__dirname, 'impl.js'), { exposedMethods: ['workerMain'],
exposedMethods: ['workerMain'], numWorkers: 1,
numWorkers: 1, maxRetries: 0,
maxRetries: 0, forkOptions: {
forkOptions: { env: {
env: { ...process.env,
...process.env, NEXT_PRIVATE_BUILD_WORKER: '1',
NEXT_PRIVATE_BUILD_WORKER: '1',
},
}, },
}) as Worker & typeof import('./impl') },
_worker.getStderr().pipe(process.stderr) }) as Worker & typeof import('./impl')
_worker.getStdout().pipe(process.stdout)
for (const worker of ((_worker as any)._workerPool?._workers || []) as {
_child: ChildProcess
}[]) {
worker._child.on('exit', (code, signal) => {
if (code || (signal && signal !== 'SIGINT')) {
debug(
`Compiler ${compilerName} unexpectedly exited with code: ${code} and signal: ${signal}`
)
}
})
}
return _worker
}
const combinedResult = { const combinedResult = {
duration: 0, duration: 0,
...@@ -74,8 +55,6 @@ async function webpackBuildWithWorker( ...@@ -74,8 +55,6 @@ async function webpackBuildWithWorker(
} }
for (const compilerName of compilerNames) { for (const compilerName of compilerNames) {
const worker = getWorker(compilerName)
const curResult = await worker.workerMain({ const curResult = await worker.workerMain({
buildContext: prunedBuildContext, buildContext: prunedBuildContext,
compilerName, compilerName,
...@@ -88,8 +67,6 @@ async function webpackBuildWithWorker( ...@@ -88,8 +67,6 @@ async function webpackBuildWithWorker(
if (nextBuildSpan && curResult.debugTraceEvents) { if (nextBuildSpan && curResult.debugTraceEvents) {
recordTraceEvents(curResult.debugTraceEvents) recordTraceEvents(curResult.debugTraceEvents)
} }
// destroy worker so it's not sticking around using memory
await worker.end()
// Update plugin state // Update plugin state
pluginState = deepMerge(pluginState, curResult.pluginState) pluginState = deepMerge(pluginState, curResult.pluginState)
...@@ -125,6 +102,9 @@ async function webpackBuildWithWorker( ...@@ -125,6 +102,9 @@ async function webpackBuildWithWorker(
} }
} }
// destroy worker so it's not sticking around using memory
worker.end()
if (compilerNames.length === 3) { if (compilerNames.length === 3) {
Log.event('Compiled successfully') Log.event('Compiled successfully')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment