Make GOMAXPROCS to be CPU limit aware

Fixes #10950

diff --git a/commands/commandeer.go b/commands/commandeer.go
index 8e768f045de9d5e0f4f852aae49eef4b89a8a040..465516e2edc19754533fd3e061532e23b6af7ab7 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -28,6 +28,8 @@ import (
 
        jww "github.com/spf13/jwalterweatherman"
 
+       "go.uber.org/automaxprocs/maxprocs"
+
        "github.com/bep/clock"
        "github.com/bep/lazycache"
        "github.com/bep/overlayfs"
@@ -53,6 +55,8 @@ var (
 
 // Execute executes a command.
 func Execute(args []string) error {
+       // Default GOMAXPROCS to be CPU limit aware, still respecting GOMAXPROCS env.
+       maxprocs.Set()
        x, err := newExec()
        if err != nil {
                return err

diff --git a/go.mod b/go.mod
index d494ee7eb391943b5d402f206e6a759780ce4717..62eeec6414a570ed1854bfb837795b863051511b 100644 (file)
--- 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 50f1ea6a77a257bafa36251482b3a1bb3ca846a6..b33e449112c1f8770b48738b5d34ec4d0de525ad 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -576,6 +576,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=