Skip to content

Commit

Permalink
crio: drop crun subcgroup
Browse files Browse the repository at this point in the history
historically crun has run with a subcgroup to allow it to own the cgroup configuration of a container
this is more idiomatic with systemd's single owner rule.

The problem is the subcgroup means there is an extra cgroup for cadvisor to read metrics for, so
moving to crun by default actually increases cpu usage. Dropping the subcgroup (with a new cri-o knob and
this annotation) fixes this regression.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
  • Loading branch information
haircommander authored and openshift-cherrypick-robot committed Dec 19, 2024
1 parent 2bc91af commit 9305086
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ contents:
]
# Based on https://github.com/containers/crun/blob/27d7dd3a0/README.md?plain=1#L48
container_min_memory = "512KiB"
default_annotations = {"run.oci.systemd.subgroup" = ""}
[crio.runtime.workloads.openshift-builder]
activation_annotation = "io.openshift.builder"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ contents:
]
# Based on https://github.com/containers/crun/blob/27d7dd3a0/README.md?plain=1#L48
container_min_memory = "512KiB"
default_annotations = {"run.oci.systemd.subgroup" = ""}
[crio.runtime.workloads.openshift-builder]
activation_annotation = "io.openshift.builder"
Expand Down

0 comments on commit 9305086

Please sign in to comment.