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

close #48342
pingcap · Nov 7, 2023 · 7aeb5d2 · 7aeb5d2
1 parent 58c7e1c
commit 7aeb5d2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/util/cgroup/cgroup_cpu_linux.go b/util/cgroup/cgroup_cpu_linux.go
@@ -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
 	}