Skip to content

ci: workaround to avoid mutate cgroupv2 mount options#5318

Merged
rata merged 1 commit into
opencontainers:mainfrom
xujihui1985:fix/checkpoint-cgroup2-mount-options
Jun 23, 2026
Merged

ci: workaround to avoid mutate cgroupv2 mount options#5318
rata merged 1 commit into
opencontainers:mainfrom
xujihui1985:fix/checkpoint-cgroup2-mount-options

Conversation

@xujihui1985

@xujihui1985 xujihui1985 commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

add --manage-cgroups-mode ignore to avoid pollute cgroupv2 mount options during unittest and intergration test
checkpoint-restore/criu#3029

@xujihui1985 xujihui1985 mentioned this pull request Jun 12, 2026
Open
@rata

rata commented Jun 12, 2026

Copy link
Copy Markdown
Member

@xujihui1985 an you explain what is the problem, show the output and all? It is not clear from the description

@kolyshkin

kolyshkin commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

@xujihui1985 an you explain what is the problem, show the output and all? It is not clear from the description

See #5267. TL;DR: runc checkpoint/restore changes host cgroup2 mount options.

@xujihui1985

xujihui1985 commented Jun 13, 2026

Copy link
Copy Markdown
Contributor Author

@xujihui1985 an you explain what is the problem, show the output and all? It is not clear from the description

Sorry for the confusion. This PR was split out from the original PR #5267 and provides a workaround for the problem described in this issue: checkpoint-restore/criu#3029

rata
rata approved these changes Jun 15, 2026
View reviewed changes

@rata rata left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks! Can we link the issue as a comment in the tests?

rata
rata requested changes Jun 15, 2026
View reviewed changes

@rata rata left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Sorry I didn't see this before, small simple fixes :)

Comment thread tests/integration/checkpoint.bats Outdated
Comment thread tests/integration/checkpoint.bats Outdated
@kolyshkin

kolyshkin commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

The more I think about it, the more it seems we should just make ignore (added by #3546) the default.

I mean, runc is doing all the mounts anyway.

Hah! I just found I mentioned it in #3546, so maybe it's time (for 1.6).

@xujihui1985 xujihui1985 force-pushed the fix/checkpoint-cgroup2-mount-options branch 3 times, most recently from 62b3483 to a282d3c Compare June 22, 2026 09:25
@kolyshkin

kolyshkin commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

The more I think about it, the more it seems we should just make ignore (added by #3546) the default.

I mean, runc is doing all the mounts anyway.

Hah! I just found I mentioned it in #3546, so maybe it's time (for 1.6).

I'm not sure though how it will handle complex cases such as sub-cgroups etc.

Anyway, this patch LGTM

@kolyshkin kolyshkin requested a review from rata June 23, 2026 01:01
@kolyshkin

kolyshkin commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@xujihui1985 can you replace fix(checkpoint): prefix with just ci: ? This is a workaround for runc CI only.

@kolyshkin

kolyshkin commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@xujihui1985 can you replace fix(checkpoint): prefix with just ci: ? This is a workaround for runc CI only.

(the fix belongs to criu)

@xujihui1985 xujihui1985 force-pushed the fix/checkpoint-cgroup2-mount-options branch 3 times, most recently from ae7adce to 055d500 Compare June 23, 2026 02:20
@xujihui1985

xujihui1985 commented Jun 23, 2026 •
edited by kolyshkin
Loading

Copy link
Copy Markdown
Contributor Author

@xujihui1985 can you replace fix(checkpoint): prefix with just ci: ? This is a workaround for runc CI only.

thanks for advice, I have replaced the commit prefix with ci

LGTM, thanks! Can we link the issue as a comment in the tests?

@rata also link the issue as a comment in the tests

@kolyshkin kolyshkin changed the title fix(checkpoint): workaround to avoid mutate cgroupv2 mount options ci: workaround to avoid mutate cgroupv2 mount options Jun 23, 2026
rata
rata reviewed Jun 23, 2026
View reviewed changes

@rata rata left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we are still missing one place at the go unit tests. Or am I missing something? Otherwise, LGTM :)

Comment thread libcontainer/integration/checkpoint_test.go
@xujihui1985
ci(checkpoint): workaround to avoid mutate cgroupv2 mount options
3805b01 
add --manage-cgroups-mode ignore to avoid pollute cgroupv2 mount options
during unittest and intergration test
checkpoint-restore/criu#3029

Signed-off-by: sean <xujihui1985@gmail.com>
@xujihui1985 xujihui1985 force-pushed the fix/checkpoint-cgroup2-mount-options branch from 055d500 to 3805b01 Compare June 23, 2026 10:59
rata
rata approved these changes Jun 23, 2026
View reviewed changes

@rata rata left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

@rata rata merged commit c63f70f into opencontainers:main Jun 23, 2026
55 of 56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rata rata rata approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

Assignees

No one assigned

Labels

area/ci

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@xujihui1985 @rata @kolyshkin