Skip to content
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.

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

containerd: upgrade io.containerd.runtime.v1.linux to io.containerd.runc.v2 (suppot cgroup v2) #11325

Merged
merged 1 commit into from
May 21, 2021

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented May 7, 2021

To support cgroup v2, the runtime has to be upgraded to io.containerd.runc.v2.

Also, io.containerd.runtime.v1.linux has been deprecated since containerd v1.4.

Tested with --driver=docker, on Ubuntu 21.04 + Docker 20.10 + cgroup v2.

fixes #11310

…d.runc.v2`

To support cgroup v2, the runtime has to be upgraded to `io.containerd.runc.v2`.

Also, `io.containerd.runtime.v1.linux` has been deprecated since containerd v1.4.

Tested with `--driver=docker`, on Ubuntu 21.04 + Docker 20.10 + cgroup v2.

Fix issue 11310

Signed-off-by: Akihiro Suda <[email protected]>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 7, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @AkihiroSuda. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: AkihiroSuda
To complete the pull request process, please assign ilya-zuyev after the PR has been reviewed.
You can assign the PR to them by writing /assign @ilya-zuyev in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 7, 2021
@AkihiroSuda AkihiroSuda changed the title containerd: upgrade io.containerd.runtime.v1.linux to io.containerd.runc.v2 containerd: upgrade io.containerd.runtime.v1.linux to io.containerd.runc.v2 (suppot cgroup v2) May 7, 2021
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@medyagh
Copy link
Member

medyagh commented May 7, 2021

@AkihiroSuda thank you for this pr. Will it break users who dont have cgroup v2? In that case how about we enable cgroup v2 only for users who have it and keep v1 for others ?

@AkihiroSuda
Copy link
Member Author

The io.containerd.runc.v2 runtime supports both cgroup v1 and cgroup v2.

io.containerd.runtime.v1.linux is completely deprecated and unrecommended, even for cgroup v1 hosts.

@medyagh
Copy link
Member

medyagh commented May 7, 2021

The io.containerd.runc.v2 runtime supports both cgroup v1 and cgroup v2.

io.containerd.runtime.v1.linux is completely deprecated and unrecommended, even for cgroup v1 hosts.

excellent thank you for educating me, there are a lot of things on containerd need to learn, minikube's default runtime been "docker" and our containerd is catching up, this seems like the right thing to do, I am gonna check the performance difference and integration tests

@medyagh
Copy link
Member

medyagh commented May 7, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 7, 2021
@k8s-ci-robot
Copy link
Contributor

@AkihiroSuda: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-minikube-build 8131387 link /test pull-minikube-build

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 55.9s    | 54.4s               |
| enable ingress | 42.0s    | 43.8s               |
+----------------+----------+---------------------+

Times for minikube start: 55.4s 55.9s 55.8s 57.4s 55.2s
Times for minikube (PR 11325) start: 57.0s 53.7s 51.4s 52.6s 57.3s

Times for minikube (PR 11325) ingress: 43.8s 43.9s 43.9s 44.3s 42.9s
Times for minikube ingress: 38.4s 37.9s 45.9s 44.3s 43.3s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 23.7s    | 23.2s               |
| enable ingress | 33.8s    | 34.1s               |
+----------------+----------+---------------------+

Times for minikube start: 24.2s 23.2s 23.8s 24.1s 23.3s
Times for minikube (PR 11325) start: 23.2s 22.8s 23.3s 23.7s 23.1s

Times for minikube (PR 11325) ingress: 34.1s 35.5s 32.5s 32.0s 36.1s
Times for minikube ingress: 32.6s 34.1s 34.1s 34.6s 33.6s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 45.9s    | 45.3s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 48.2s 48.4s 44.3s 44.4s 44.3s
Times for minikube (PR 11325) start: 49.4s 44.1s 44.1s 44.1s 44.6s

@medyagh
Copy link
Member

medyagh commented May 7, 2021

weird the integration test for docker_containerd_linux is taking more than 2 hours and counting...it usually ends in less than 70 minutes

@medyagh
Copy link
Member

medyagh commented May 7, 2021

build 1914

Screen Shot 2021-05-07 at 4 42 39 PM

@afbjorklund
Copy link
Collaborator

I would very much prefer if we could drop the inline configuration of containerd and dockerd

And only update the fields that we care about, and leave the rest to the original installation...

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented May 9, 2021

I would very much prefer if we could drop the inline configuration of containerd and dockerd

And only update the fields that we care about, and leave the rest to the original installation...

👍, but can we visit that in another PR?

We also have to switch away from config format v1 to config format v2.
(Note: config format "v2" is not specific for runtime v2 nor cgroup v2. Each of these components has its own independent version number.)

@afbjorklund
Copy link
Collaborator

+1, but can we visit that in another PR?

Yes, it is a separate topic. But it would have avoided the need from having to update the embedded config.

@medyagh
Copy link
Member

medyagh commented May 9, 2021

/retest-this-please

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 49.8s    | 47.6s               |
| enable ingress | 36.3s    | 37.0s               |
+----------------+----------+---------------------+

Times for minikube (PR 11325) start: 46.2s 47.4s 50.5s 46.2s 47.6s
Times for minikube start: 53.9s 48.2s 50.1s 50.1s 46.9s

Times for minikube ingress: 40.2s 34.2s 34.2s 38.4s 34.2s
Times for minikube (PR 11325) ingress: 42.7s 36.2s 36.8s 34.8s 34.3s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 22.0s    | 21.5s               |
| enable ingress | 29.5s    | 30.6s               |
+----------------+----------+---------------------+

Times for minikube start: 22.1s 23.5s 20.8s 22.0s 21.8s
Times for minikube (PR 11325) start: 21.4s 22.7s 20.7s 21.9s 20.6s

Times for minikube ingress: 29.9s 25.5s 29.0s 31.5s 31.5s
Times for minikube (PR 11325) ingress: 30.0s 29.0s 29.5s 29.5s 35.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 43.0s    | 43.8s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 30.7s 46.8s 44.8s 43.4s 49.0s
Times for minikube (PR 11325) start: 42.7s 43.0s 43.1s 47.0s 43.2s

@medyagh
Copy link
Member

medyagh commented May 13, 2021

/retest-this-please

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 49.2s    | 49.7s               |
| enable ingress | 34.9s    | 35.1s               |
+----------------+----------+---------------------+

Times for minikube start: 53.3s 50.4s 48.1s 47.8s 46.3s
Times for minikube (PR 11325) start: 46.8s 47.4s 51.1s 55.6s 47.6s

Times for minikube ingress: 34.3s 35.7s 34.3s 35.7s 34.2s
Times for minikube (PR 11325) ingress: 34.2s 37.3s 34.2s 34.7s 35.4s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 22.0s    | 22.0s               |
| enable ingress | 30.1s    | 30.4s               |
+----------------+----------+---------------------+

Times for minikube start: 23.7s 21.0s 21.6s 21.5s 22.0s
Times for minikube (PR 11325) start: 21.3s 21.8s 21.8s 23.0s 22.3s

Times for minikube ingress: 27.0s 30.5s 37.0s 28.0s 28.0s
Times for minikube (PR 11325) ingress: 30.5s 28.0s 33.0s 31.5s 29.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 11325) |
+----------------+----------+---------------------+
| minikube start | 41.6s    | 44.9s               |
| enable ingress |          |                     |
+----------------+----------+---------------------+

Times for minikube start: 31.4s 42.9s 47.4s 43.1s 42.9s
Times for minikube (PR 11325) start: 48.2s 43.1s 43.0s 47.0s 43.5s

@medyagh medyagh merged commit 9db3ae6 into kubernetes:master May 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
6 participants