This repository was archived by the owner on Feb 8, 2021. It is now read-only.
Improve supervisor eventlog locking and API compliance. #378
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Hm, this actually looks like the issue in #379 is being made visible to tests now... |
wrouesnel
force-pushed
the
update-supervisor-eventcode
branch
from
09808d2 to
772591b
Compare
gao-feng
reviewed
Oct 28, 2016
supervisor/container.go
Outdated
| } | ||
|
|
||
| func (c *Container) run(p *Process) { | ||
| func (c *Container) run(p *Process) error { |
Contributor
Author
|
This patch is built on the prior PR at this point, and not quite ready since it doesn't pass existing tests yet. I'm still playing around with the event log code to figure out how it should best work. |
Add finer-grained locking to the supervisor eventlog based on the upstream docker containerd code. Adds full compliance for the Event() API by supporting queries for specific container IDs and stored events only, as required by newer Docker daemons in order to recover from hard shutdowns without deadlocking the docker daemon.
wrouesnel
force-pushed
the
update-supervisor-eventcode
branch
from
772591b to
4272154
Compare
Contributor
|
@wrouesnel runv cli is being improved continuously and had just been refactored at #537 . As a result, it seams that the changes in this pr is outdated. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add finer-grained locking to the supervisor eventlog based on the upstream docker containerd code.
Adds full compliance for the Event() API by supporting queries for specific container IDs and stored events only, as required by newer Docker daemons in order to recover from hard shutdowns without deadlocking the docker daemon.
This fixes the problem of deadlocking docker when running with runv and doing a hard shutdown, as runv was not responding with the events docker actually wanted.
The code is mostly adapted from https://github.com/docker/containerd/blob/master/supervisor/supervisor.go.