Handle hybrid cgroup mode in monit firewall logic#417
Merged
selzoc merged 1 commit intocloudfoundry:mainfrom Mar 2, 2026
Merged
Handle hybrid cgroup mode in monit firewall logic#417selzoc merged 1 commit intocloudfoundry:mainfrom
selzoc merged 1 commit intocloudfoundry:mainfrom
Conversation
441a049 to
7ed6c17
Compare
Replace the isCgroupAccessible heuristic (which rejected hybrid cgroup systems entirely) with filesystem-type detection using Statfs. On ubuntu-jammy (hybrid mode), cgroupv2 is mounted at /sys/fs/cgroup/unified; on ubuntu-noble (pure unified mode), it is at /sys/fs/cgroup. The cgroup path is now prefixed accordingly so that inode lookups resolve against the correct mount point. For containerized environments (docker-cpi, garden-runc) where cgroup socket matching is rejected by the kernel due to cgroup namespace isolation, adjust the UID-fallback path. Rather than allowing just the current euid (typically root), explicit allow access for the "vcap" user.
7ed6c17 to
34358c6
Compare
rkoster
approved these changes
Mar 2, 2026
This was referenced Mar 2, 2026
Member
|
Thanks @abg ! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace the isCgroupAccessible heuristic (which rejected hybrid cgroup systems entirely) with filesystem-type detection using Statfs. On ubuntu-jammy (hybrid mode), cgroupv2 is mounted at /sys/fs/cgroup/unified; on ubuntu-noble (pure unified mode), it is at /sys/fs/cgroup. The cgroup path is now prefixed accordingly so that inode lookups resolve against the correct mount point.
For containerized environments (docker-cpi, garden-runc) where cgroup socket matching is rejected by the kernel due to cgroup namespace isolation, adjust the UID-fallback path. Rather than allowing just the current euid (typically root), explicit allow access for the "vcap" user.