Update monitor to subscribe to channel #24
Merged
Conversation
This file contains 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
mlaventure
requested changes
Aug 31, 2017
monitor.go
Outdated
| if status, ok := exitErr.Sys().(syscall.WaitStatus); ok { | ||
| return status.ExitStatus(), nil | ||
| func (m *defaultMonitor) Start(c *exec.Cmd) (chan Exit, error) { | ||
| ec := make(chan Exit, 1) |
There was a problem hiding this comment.
nit: this can be moved just before the go func to avoid an extra close(ec) 2 lines below
| } | ||
| return 0, nil | ||
| ec <- Exit{ | ||
| Timestamp: time.Now(), |
There was a problem hiding this comment.
nit: get the time as soon as c.Wait() returns for more accuracy?
There was a problem hiding this comment.
i don't think you will get any closer with the error handling
There was a problem hiding this comment.
Mostly because I don't trust the scheduler :)
There was a problem hiding this comment.
its sends the value so the fields are all done
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
crosbymichael
force-pushed
the
monitor-v2
branch
from
dbe04b9 to
d9f4d00
Compare
|
@mlaventure updated |
stevvooe
approved these changes
Aug 31, 2017
|
@stevvooe ya, this is all internal code for the most part, you can see the full PR for containerd here: containerd/containerd#1452 |
crosbymichael
added a commit
to crosbymichael/containerd
that referenced
this pull request
Aug 31, 2017
Depends on containerd/go-runc#24 The is currently a race with the reaper where you could miss some exit events from processes. The problem before and why the reaper was so complex was because processes could fork, getting a pid, and then fail on an execve before we would have time to register the process with the reaper. This could cause pids to fill up in a map as a way to reduce the race. This changes makes the reaper handle multiple subscribers so that the caller can handle locking, for when they want to wait for a specific pid, without affecting other callers using the reaper code. Exit events are broadcast to multiple subscribers, in the case, the runc commands and container pids that we get from a pid-file. Locking while the entire container stats no longs affects runc commands where you want to call `runc create` and wait until that has been completed. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Michael Crosby crosbymichael@gmail.com