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

Limit sharp's concurrency #53385

Merged
merged 6 commits into from
Aug 11, 2023
Merged

Limit sharp's concurrency #53385

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e572e7c
limit sharp's concurrency
shuding Jul 31, 2023
b2ed03b
Update image-optimizer.ts
shuding Jul 31, 2023
72bc436
Update packages/next/src/server/image-optimizer.ts
shuding Jul 31, 2023
4adb7f3
Update packages/next/src/server/image-optimizer.ts
shuding Aug 11, 2023
56cf8d8
update comment
styfle Aug 11, 2023
acd977e
Merge branch 'canary' into shu/fv8u
styfle Aug 11, 2023
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
15 changes: 9 additions & 6 deletions packages/next/src/server/image-optimizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createHash } from 'crypto'
import { promises } from 'fs'
import { cpus } from 'os'
import type { IncomingMessage, ServerResponse } from 'http'
import { mediaType } from 'next/dist/compiled/@hapi/accept'
import chalk from 'next/dist/compiled/chalk'
Expand Down Expand Up @@ -43,15 +44,17 @@ const VECTOR_TYPES = [SVG]
const BLUR_IMG_SIZE = 8 // should match `next-image-loader`
const BLUR_QUALITY = 70 // should match `next-image-loader`

let sharp:
| ((
input?: string | Buffer,
options?: import('sharp').SharpOptions
) => import('sharp').Sharp)
| undefined
let sharp: typeof import('sharp') | undefined

try {
sharp = require(process.env.NEXT_SHARP_PATH || 'sharp')
if (sharp && sharp.concurrency() > 1) {
// Reducing concurrency should reduce the memory usage too.
// We more aggressively reduce in dev but also reduce in prod.
// https://sharp.pixelplumbing.com/api-utility#concurrency
const divisor = process.env.NODE_ENV === 'development' ? 4 : 2
sharp.concurrency(Math.floor(Math.max(cpus().length / divisor, 1)))
}
} catch (e) {
// Sharp not present on the server, Squoosh fallback will be used
}
Expand Down
Loading