Skip to content

cgroup: do not create a sub-cgroup by default #1768

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cgroup: do not create a sub-cgroup by default #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions crun.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,27 +577,29 @@ chown -R the_user.the_user /sys/fs/cgroup/systemd
.EE

.SH \fBrun.oci.systemd.subgroup=SUBGROUP\fR
Override the name for the systemd sub cgroup created under the systemd
scope, so the final cgroup will be like:
This configuration option allows you to define a sub-cgroup that will
be created under a systemd-managed cgroup for your container.

.PP
When SUBGROUP is specified, the complete cgroup path will follow this
structure:

.EX
/sys/fs/cgroup/$PATH/$SUBGROUP
.EE

.PP
When it is set to the empty string, a sub cgroup is not created.

.PP
If not specified, it defaults to \fBcontainer\fR on cgroup v2, and to \fB""\fR
on cgroup v1.

.PP
e.g.
If \fBSUBGROUP\fR is set to \fBcontainer\fR, a typical path could be:

.EX
/sys/fs/cgroup//system.slice/foo-352700.scope/container
/sys/fs/cgroup/system.slice/foo-352700.scope/container
.EE

.PP
If \fBSUBGROUP\fR is set to an empty string, no sub-cgroup will be
created. By default, this option is not configured, meaning no
sub-cgroup is created unless explicitly set.

.SH \fBrun.oci.delegate-cgroup=DELEGATED-CGROUP\fR
If the \fBrun.oci.systemd.subgroup\fR annotation is specified, yet another
sub-cgroup is created and the container process is moved here.
Expand Down
21 changes: 11 additions & 10 deletions crun.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,24 +489,25 @@ chown -R the_user.the_user /sys/fs/cgroup/systemd

## `run.oci.systemd.subgroup=SUBGROUP`

Override the name for the systemd sub cgroup created under the systemd
scope, so the final cgroup will be like:
This configuration option allows you to define a sub-cgroup that will
be created under a systemd-managed cgroup for your container.

When SUBGROUP is specified, the complete cgroup path will follow this
structure:

```
/sys/fs/cgroup/$PATH/$SUBGROUP
```

When it is set to the empty string, a sub cgroup is not created.

If not specified, it defaults to `container` on cgroup v2, and to `""`
on cgroup v1.

e.g.

If `SUBGROUP` is set to `container`, a typical path could be:
```
/sys/fs/cgroup//system.slice/foo-352700.scope/container
/sys/fs/cgroup/system.slice/foo-352700.scope/container
```

If `SUBGROUP` is set to an empty string, no sub-cgroup will be
created. By default, this option is not configured, meaning no
sub-cgroup is created unless explicitly set.

## `run.oci.delegate-cgroup=DELEGATED-CGROUP`

If the `run.oci.systemd.subgroup` annotation is specified, yet another
Expand Down
2 changes: 1 addition & 1 deletion src/libcrun/cgroup-systemd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ find_systemd_subgroup (string_map *annotations)
return annotation;
}

return "container";
return NULL;
}

static int
Expand Down