-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Make sure to use internal containerd for docker #8518
Conversation
When not using the containerd.service, we should make sure that dockerd does not use the stopped containerd.
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: afbjorklund The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Here was the sequence being used:
When starting up dockerd with containerd running, it must be restarted (not started) after stopping containerd. Otherwise it will still be using /run/containerd/containerd.sock instead of /run/docker/containerd/containerd.sock
Only do this when not configured to use the containerd.socket. The new sequence will instead be:
|
Travis tests have failedHey @afbjorklund, 1st Buildmake test
TravisBuddy Request Identifier: 699602a0-b2cd-11ea-894e-97d5968798bd |
It would be possible to "optimize" this, by looking to see if the containerd was Active before it was Disabled. But it is not worth the special case, and there some edge-cases (really need to be looking at what it uses) At least this way it doesn't just hang at boot, even if it might (?) take 10 seconds or so longer. When docker.service is changed to used containerd.service instead, it will not have to restart. |
When docker.service is *not* bound to containerd.service, that means that it will be restarted to not try to use it.
Codecov Report
@@ Coverage Diff @@
## master #8518 +/- ##
=======================================
Coverage 33.87% 33.88%
=======================================
Files 154 154
Lines 9897 9899 +2
=======================================
+ Hits 3353 3354 +1
- Misses 6140 6141 +1
Partials 404 404
|
/ok-to-test |
kvm2 Driver Times for Minikube (PR 8518): [64.939720759 67.19685330700001 64.375637303] Averages Time Per Log
docker Driver Times for Minikube (PR 8518): [27.909823907000003 25.399893089000003 26.574547641] Averages Time Per Log
|
All three non kic drivers tests failed, KVM, Virtualbox, Hyperkit fail on TestPause/serial/SecondStartNoReconfiguration the relevent error message is
which means these two commands will cause api server to be stopped. could it be side effect of this PR that restarts docker but the apisever container stopped and not restarted? |
If starting minikube a second time, do nothing.
If we stopped containerd, we restart dockerd.
It was stopping due to the docker restart, now there should only be one restart (the first time) so should be fixed. Added a unit test. |
kvm2 Driver Times for Minikube (PR 8518): [64.0628594 63.93488335399999 65.375345129] Averages Time Per Log
docker Driver Times for Minikube (PR 8518): [26.057575515000003 26.272541984000004 25.391872984000003] Averages Time Per Log
|
When not using the containerd.service, we should make
sure that dockerd does not use the stopped containerd.
Closes #8203