Skip to content

Mount /sys/fs/cgroup as cgroup2 type if supported #9094

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
Merged
merged 1 commit into from
Mar 6, 2025
Merged

Mount /sys/fs/cgroup as cgroup2 type if supported #9094

merged 1 commit into from
Mar 6, 2025

Conversation

mariash
Copy link
Contributor

@mariash mariash commented Mar 5, 2025 •
edited by taylorsilva
Loading

Changes proposed by this PR

Closes #9063

Concourse is failing to run on systems that only support cgroup v2 since it is trying to mount /sys/fs/cgroup into container as "cgroup" type. For cgroups v2 it should be "cgroup2" type. Use "cgroups.IsCgroup2UnifiedMode()" method to determine if system supports cgroups v2 and if it is then mount it inside of container.

Notes to reviewer

IsCgroup2UnifiedMode method is memoizing the cgroup mode.

Release Note

  • Enable cgroupv2 support for the Guardian runtime by mounting /sys/fs/cgroup as cgroup2 type if supported. Requires Garden v1.67.0 or greater

@mariash mariash requested a review from a team as a code owner March 5, 2025 00:27
@taylorsilva
Copy link
Member

Thanks for the PR @mariash! Can you sign-off your PR's please to get the DCO check passing: https://github.com/concourse/concourse/pull/9094/checks?check_run_id=38206512380

@taylorsilva
Copy link
Member

Looks like unit tests flaked. Running again for you.

@taylorsilva
Copy link
Member

This all relies on a certain version of Garden, correct? Anything >= 1.67.0?

@taylorsilva
Copy link
Member

Updated OP to state that this PR closes #9063
Maria, please update if this is incorrect.

taylorsilva
taylorsilva approved these changes Mar 5, 2025
View reviewed changes
Copy link
Member

@taylorsilva taylorsilva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Please sign-off your commits and then I can merge this.

@mariash
Mount /sys/fs/cgroup as type cgroup2 if supported
ae402e3 
Signed-off-by: Maria Shaldybin <maria.shaldybin@broadcom.com>
@mariash
Copy link
Contributor Author

mariash commented Mar 6, 2025

@taylorsilva I signed off the commit. Yes, it needs garden 1.67.0 Thank you!

@taylorsilva taylorsilva merged commit 8503568 into concourse:master Mar 6, 2025
11 checks passed
@aliculPix4D
Copy link
Contributor

@taylorsilva FYI after this PR, we can't build concourse worker binaries on darwin and windows anymore

  1. windows
+ CGO=0 GOOS=windows GOARCH=amd64 go build -o concourse/bin/concourse.exe -ldflags '-X github.com/concourse/concourse.Version=((redacted))' ./cmd/concourse
# github.com/opencontainers/runc/libcontainer/devices
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/devices/device.go:173:9: undefined: mkDev
# github.com/opencontainers/runc/libcontainer/utils
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:35:21: undefined: unix.CmsgSpace
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:45:29: undefined: unix.Recvmsg
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:45:66: undefined: unix.MSG_CMSG_CLOEXEC
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:56:20: undefined: unix.ParseSocketControlMessage
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:73:13: undefined: unix.Close
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:78:30: undefined: unix.SCM_RIGHTS
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:79:24: undefined: unix.ParseUnixRights
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:117:14: undefined: unix.UnixRights
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:118:14: undefined: unix.Sendmsg
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils.go:19:29: undefined: unix.WaitStatus
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:118:14: too many errors
  1. darwin
+ CGO=0 GOOS=darwin GOARCH=arm64 go build -o concourse/bin/concourse -ldflags '-X github.com/concourse/concourse.Version=((redacted))' ./cmd/concourse
# github.com/opencontainers/runc/libcontainer/utils
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/cmsg.go:45:66: undefined: unix.MSG_CMSG_CLOEXEC
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:27:22: undefined: unix.PROC_SUPER_MAGIC
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:47:14: undefined: unix.CloseRange
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:47:56: undefined: unix.CLOSE_RANGE_CLOEXEC
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:105:15: undefined: unix.CloseRange
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:105:58: undefined: unix.CLOSE_RANGE_CLOEXEC
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:152:67: undefined: unix.SOCK_CLOEXEC
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:177:36: undefined: unix.O_PATH
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:232:55: undefined: unix.Gettid
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:245:140: undefined: unix.Gettid
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/utils/utils_unix.go:245:140: too many errors
# github.com/opencontainers/runc/libcontainer/configs
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/configs/config.go:224:15: undefined: LinuxPersonality
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/configs/config.go:234:47: undefined: unix.SchedAttr
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/configs/config.go:277:15: undefined: unix.SchedAttr
/go/pkg/mod/github.com/opencontainers/runc@v1.2.5/libcontainer/configs/config.go:278:18: undefined: unix.SizeofSchedAttr

@taylorsilva
Copy link
Member

taylorsilva commented Mar 7, 2025 •
edited
Loading

Thanks for the heads up. I should add this as a check to the PRs pipeline.

I'll work on a fix.

taylorsilva added a commit that referenced this pull request Mar 7, 2025
@taylorsilva
worker: further split linux and non-linux features
4ee8c2b 
We've had a few PR's that are specific to our linux-containerd
implementation: #9017 and #9094

After these PR's folks in the community found that they couldn't compile
Concourse for non-Linux platforms. This commit tries to make it easier
for future contributors to make changes to the containerd-linux runtime
and not accidently break things for non-linux platforms.

Signed-off-by: Taylor Silva <dev@taydev.net>
@taylorsilva taylorsilva mentioned this pull request Mar 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taylorsilva taylorsilva taylorsilva approved these changes

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support cgroups v2 with garden
3 participants
@mariash @taylorsilva @aliculPix4D