backport of commit 1bb310d (#16189)

This pull request was automerged via backport-assistant
hashicorp · Feb 14, 2023 · e5e6a5b · e5e6a5b
1 parent d257da3
commit e5e6a5b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.changelog/16180.txt b/.changelog/16180.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cgutil: handle panic coming from runc helper method
+```
diff --git a/client/lib/cgutil/cgutil_linux.go b/client/lib/cgutil/cgutil_linux.go
@@ -18,7 +18,19 @@ import (
 // cgroups.v1
 //
 // This is a read-only value.
-var UseV2 = cgroups.IsCgroup2UnifiedMode()
+var UseV2 = safelyDetectUnifiedMode()
+
+// Currently it is possible for the runc utility function to panic
+// https://github.com/opencontainers/runc/pull/3745
+func safelyDetectUnifiedMode() (result bool) {
+	defer func() {
+		if r := recover(); r != nil {
+			result = false
+		}
+	}()
+	result = cgroups.IsCgroup2UnifiedMode()
+	return
+}
 
 // GetCgroupParent returns the mount point under the root cgroup in which Nomad
 // will create cgroups. If parent is not set, an appropriate name for the version