github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107112 from linxiulei/fix_pidmax

Browse Source 
Consider threads-max when deciding MaxPID.
This commit is contained in:
Kubernetes Prow Robot 2022-02-09 20:49:45 -08:00 committed by GitHub
commit 40c2d04946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubelet/stats/pidlimit/pidlimit_linux.go
View File

@ -25,7 +25,7 @@ import (
"syscall" "syscall"
"time" "time"
"k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
) )
@ -33,11 +33,22 @@ import (
func Stats() (*statsapi.RlimitStats, error) { func Stats() (*statsapi.RlimitStats, error) {
rlimit := &statsapi.RlimitStats{} rlimit := &statsapi.RlimitStats{}
if content, err := ioutil.ReadFile("/proc/sys/kernel/pid_max"); err == nil { taskMax := int64(-1)
if maxPid, err := strconv.ParseInt(string(content[:len(content)-1]), 10, 64); err == nil { // Calculate the mininum of kernel.pid_max and kernel.threads-max as they both specify the
rlimit.MaxPID = &maxPid // system-wide limit on the number of tasks.
for _, file := range []string{"/proc/sys/kernel/pid_max", "/proc/sys/kernel/threads-max"} {
if content, err := ioutil.ReadFile(file); err == nil {
if limit, err := strconv.ParseInt(string(content[:len(content)-1]), 10, 64); err == nil {
if taskMax == -1 || taskMax > limit {
taskMax = limit
}
}
} }
} }
// Both reads did not fail.
if taskMax >= 0 {
rlimit.MaxPID = &taskMax
}
var info syscall.Sysinfo_t var info syscall.Sysinfo_t
syscall.Sysinfo(&info) syscall.Sysinfo(&info)

6
staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/types.go
View File

@ -65,9 +65,11 @@ type NodeStats struct {
type RlimitStats struct { type RlimitStats struct {
Time metav1.Time `json:"time"` Time metav1.Time `json:"time"`
// The max PID of OS. // The max number of extant process (threads, precisely on Linux) of OS. See RLIMIT_NPROC in getrlimit(2).
// The operating system ceiling on the number of process IDs that can be assigned.
// On Linux, tasks (either processes or threads) consume 1 PID each.
MaxPID *int64 `json:"maxpid,omitempty"` MaxPID *int64 `json:"maxpid,omitempty"`
// The number of running process in the OS. // The number of running process (threads, precisely on Linux) in the OS.
NumOfRunningProcesses *int64 `json:"curproc,omitempty"` NumOfRunningProcesses *int64 `json:"curproc,omitempty"`
} }