vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Update shim for exec

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-02-01 11:02:41 -08:00
parent 6808dbc02f
commit 835f3b6a97
37 changed files with 786 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

18
supervisor/exit.go
View file

@ -25,7 +25,9 @@ func (h *ExitEvent) Handle(e *Event) error {
if proc.ID() != runtime.InitProcessID {
ne := NewEvent(ExecExitEventType)
ne.ID = proc.Container().ID()
ne.Pid = proc.ID()
ne.Status = status
ne.Process = proc
h.s.SendEvent(ne)
return nil
@ -51,17 +53,11 @@ type ExecExitEvent struct {
}
func (h *ExecExitEvent) Handle(e *Event) error {
container := e.Process.Container()
// exec process: we remove this process without notifying the main event loop
/*
info := h.s.processes[e.Pid]
if err := info.container.RemoveProcess(e.Pid); err != nil {
logrus.WithField("error", err).Error("containerd: find container for pid")
}
if err := info.copier.Close(); err != nil {
logrus.WithField("error", err).Error("containerd: close process IO")
}
delete(h.s.processes, e.Pid)
h.s.notifySubscribers(e)
*/
if err := container.RemoveProcess(e.Pid); err != nil {
logrus.WithField("error", err).Error("containerd: find container for pid")
}
h.s.notifySubscribers(e)
return nil
}