Rename cgroupNamespaceSupported, add details

mook-as · jedevc · commit 3a2904a30daf · 2023-10-13T11:31:19.000+01:00
This responds to review feedback from #4308 (review) Signed-off-by: Mark Yen <mark.yen@suse.com> (cherry picked from commit f9ccb09) Signed-off-by: Justin Chadwell <me@jedevc.com>
diff --git a/executor/oci/spec.go b/executor/oci/spec.go
@@ -137,7 +137,7 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou
 		return nil, nil, err
 	}
 
-	if cgroupNamespaceSupported() {
+	if cgroupV2NamespaceSupported() {
 		s.Linux.Namespaces = append(s.Linux.Namespaces, specs.LinuxNamespace{
 			Type: specs.CgroupNamespace,
 		})
diff --git a/executor/oci/spec_unix.go b/executor/oci/spec_unix.go
@@ -147,7 +147,11 @@ func getTracingSocket() string {
 	return fmt.Sprintf("unix://%s", tracingSocketPath)
 }
 
-func cgroupNamespaceSupported() bool {
+func cgroupV2NamespaceSupported() bool {
+	// Check if cgroups v2 namespaces are supported.  Trying to do cgroup
+	// namespaces with cgroups v1 results in EINVAL when we encounter a
+	// non-standard hierarchy.
+	// See https://github.com/moby/buildkit/issues/4108
 	cgroupNSOnce.Do(func() {
 		if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
 			return
diff --git a/executor/oci/spec_windows.go b/executor/oci/spec_windows.go
@@ -64,6 +64,6 @@ func getTracingSocket() string {
 	return fmt.Sprintf("npipe://%s", filepath.ToSlash(tracingSocketPath))
 }
 
-func cgroupNamespaceSupported() bool {
+func cgroupV2NamespaceSupported() bool {
 	return false
 }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou`
`137`	`137`	`return nil, nil, err`
`138`	`138`	`}`
`139`	`139`
`140`		`- if cgroupNamespaceSupported() {`
	`140`	`+ if cgroupV2NamespaceSupported() {`
`141`	`141`	`s.Linux.Namespaces = append(s.Linux.Namespaces, specs.LinuxNamespace{`
`142`	`142`	`Type: specs.CgroupNamespace,`
`143`	`143`	`})`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ func getTracingSocket() string {`
`64`	`64`	`return fmt.Sprintf("npipe://%s", filepath.ToSlash(tracingSocketPath))`
`65`	`65`	`}`
`66`	`66`
`67`		`-func cgroupNamespaceSupported() bool {`
	`67`	`+func cgroupV2NamespaceSupported() bool {`
`68`	`68`	`return false`
`69`	`69`	`}`