From 59050f97f637b7cb423e6f5b63e36c1ea973c183 Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Wed, 17 May 2023 11:17:22 -0700
Subject: [PATCH] Make GOMAXPROCS CPU limit aware

Fixes #10950
---
 go.mod  | 1 +
 go.sum  | 2 ++
 main.go | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/go.mod b/go.mod
index 171d3921f..e6ba9b94a 100644
--- a/go.mod
+++ b/go.mod
@@ -60,6 +60,7 @@ require (
 	github.com/tdewolff/parse/v2 v2.6.5
 	github.com/yuin/goldmark v1.5.4
 	go.uber.org/atomic v1.10.0
+	go.uber.org/automaxprocs v1.5.2
 	gocloud.dev v0.24.0
 	golang.org/x/exp v0.0.0-20221031165847-c99f073a8326
 	golang.org/x/image v0.5.0
diff --git a/go.sum b/go.sum
index 30af63f39..86603ffa5 100644
--- a/go.sum
+++ b/go.sum
@@ -574,6 +574,8 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=
+go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
diff --git a/main.go b/main.go
index e08bf7c53..51c0a04bd 100644
--- a/main.go
+++ b/main.go
@@ -18,6 +18,9 @@ import (
 	"os"
 
 	"github.com/gohugoio/hugo/commands"
+
+	// default GOMAXPROCS to be CPU limit aware, still respecting GOMAXPROCS env
+	_ "go.uber.org/automaxprocs"
 )
 
 func main() {