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

util/cgroup: fix InContainer for cgroup v2 (#48344) #48345

Merged
merged 1 commit into from
Nov 7, 2023
Merged

util/cgroup: fix InContainer for cgroup v2 (#48344) #48345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion util/cgroup/cgroup_cpu_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ func CPUQuotaToGOMAXPROCS(minValue int) (int, CPUQuotaStatus, error) {

// InContainer returns true if the process is running in a container.
func InContainer() bool {
v, err := os.ReadFile(procPathCGroup)
// for cgroup V1, check /proc/self/cgroup, for V2, check /proc/self/mountinfo
return inContainer(procPathCGroup) || inContainer(procPathMountInfo)
}

func inContainer(path string) bool {
v, err := os.ReadFile(path)
if err != nil {
return false
}
Expand Down