Skip to content

Commit

Permalink
Merge pull request containers#2199 from giuseppe/do-not-set-nproc-to-max
Browse files Browse the repository at this point in the history
config: do not set the default nproc to the max available
  • Loading branch information
openshift-merge-bot[bot] authored Oct 11, 2024
2 parents f4b2e92 + d46e392 commit 25644f1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 35 deletions.
1 change: 0 additions & 1 deletion pkg/config/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ func defaultConfig() (*Config, error) {
DNSServers: attributedstring.Slice{},
DefaultCapabilities: attributedstring.NewSlice(DefaultCapabilities),
DefaultSysctls: attributedstring.Slice{},
DefaultUlimits: attributedstring.NewSlice(getDefaultProcessLimits()),
Devices: attributedstring.Slice{},
EnableKeyring: true,
EnableLabeling: selinuxEnabled(),
Expand Down
34 changes: 0 additions & 34 deletions pkg/config/default_linux.go
Original file line number Diff line number Diff line change
@@ -1,47 +1,13 @@
package config

import (
"fmt"
"os"
"strconv"
"strings"

"golang.org/x/sys/unix"
)

const (
oldMaxSize = uint64(1048576)
)

func getDefaultCgroupsMode() string {
return "enabled"
}

// getDefaultProcessLimits returns the nproc for the current process in ulimits format
// Note that nfile sometimes cannot be set to unlimited, and the limit is hardcoded
// to (oldMaxSize) 1048576 (2^20), see: http://stackoverflow.com/a/1213069/1811501
// In rootless containers this will fail, and the process will just use its current limits
func getDefaultProcessLimits() []string {
rlim := unix.Rlimit{Cur: oldMaxSize, Max: oldMaxSize}
oldrlim := rlim
// Attempt to set file limit and process limit to pid_max in OS
dat, err := os.ReadFile("/proc/sys/kernel/pid_max")
if err == nil {
val := strings.TrimSuffix(string(dat), "\n")
maxLimit, err := strconv.ParseUint(val, 10, 64)
if err == nil {
rlim = unix.Rlimit{Cur: maxLimit, Max: maxLimit}
}
}
defaultLimits := []string{}
if err := unix.Setrlimit(unix.RLIMIT_NPROC, &rlim); err == nil {
defaultLimits = append(defaultLimits, fmt.Sprintf("nproc=%d:%d", rlim.Cur, rlim.Max))
} else if err := unix.Setrlimit(unix.RLIMIT_NPROC, &oldrlim); err == nil {
defaultLimits = append(defaultLimits, fmt.Sprintf("nproc=%d:%d", oldrlim.Cur, oldrlim.Max))
}
return defaultLimits
}

// getDefaultTmpDir for linux
func getDefaultTmpDir() string {
// first check the TMPDIR env var
Expand Down

0 comments on commit 25644f1

Please sign in to comment.