Skip to content

cgroupv2: don't use GetCgroupMounts for criu c/r#2276

Merged
mrunalp merged 1 commit into
opencontainers:masterfrom
kolyshkin:criu-v2
Apr 2, 2020
Merged

cgroupv2: don't use GetCgroupMounts for criu c/r#2276
mrunalp merged 1 commit into
opencontainers:masterfrom
kolyshkin:criu-v2

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

When performing checkpoint or restore of cgroupv2 unified hierarchy,
there is no need to call getCgroupMounts() / cgroups.GetCgroupMounts()
as there's only a single mount in there.

This eliminates the last internal (i.e. runc) use of
cgroups.GetCgroupMounts() for v2 unified case. Unfortunately, there
are external ones (e.g. moby/moby) so we can't yet let it
return an error.

@adrianreber PTAL

@adrianreber
Copy link
Copy Markdown
Contributor

Makes sense. 👍

@kolyshkin
Copy link
Copy Markdown
Contributor Author

CI failure is unrelated and is fixed by #2268

@iwankgb iwankgb mentioned this pull request Mar 30, 2020
When performing checkpoint or restore of cgroupv2 unified hierarchy,
there is no need to call getCgroupMounts() / cgroups.GetCgroupMounts()
as there's only a single mount in there.

This eliminates the last internal (i.e. runc) use case of
cgroups.GetCgroupMounts() for v2 unified. Unfortunately, there
are external ones (e.g. moby/moby) so we can't yet let it
return an error.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
Copy link
Copy Markdown
Contributor Author

rebased (to include #2268) to fix CI failure

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Apr 1, 2020

LGTM

Approved with PullApprove

@kolyshkin kolyshkin changed the title cgroupv2: don't use GetCgroupMounts for criu c/r [WIP] cgroupv2: don't use GetCgroupMounts for criu c/r Apr 1, 2020
@kolyshkin
Copy link
Copy Markdown
Contributor Author

Added WIP -- I overlooked another use of GetPaths(), will add a commit fixing it

@kolyshkin kolyshkin changed the title [WIP] cgroupv2: don't use GetCgroupMounts for criu c/r cgroupv2: don't use GetCgroupMounts for criu c/r Apr 1, 2020
@kolyshkin
Copy link
Copy Markdown
Contributor Author

Added WIP -- I overlooked another use of GetPaths(), will add a commit fixing it

Nevermind, it was not in c/r code and can be dealt with separately.

@mrunalp
Copy link
Copy Markdown
Contributor

mrunalp commented Apr 2, 2020

LGTM

Approved with PullApprove

@mrunalp mrunalp merged commit e3e26ca into opencontainers:master Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants