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

Call delete before closing IO in shim

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-03-14 16:31:14 -07:00
parent bd23df8fd1
commit 52a1dfb418
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
containerd-shim/main.go
View file

@ -58,11 +58,9 @@ func main() {
if err := p.Close(); err != nil { if err := p.Close(); err != nil {
logrus.WithField("error", err).Error("shim: close stdio") logrus.WithField("error", err).Error("shim: close stdio")
} }
if err := p.delete(); err != nil {
logrus.WithField("error", err).Error("shim: delete runtime state")
}
}() }()
if err := p.start(); err != nil { if err := p.start(); err != nil {
p.delete()
logrus.WithField("error", err).Error("shim: start process") logrus.WithField("error", err).Error("shim: start process")
return return
} }
@ -117,6 +115,7 @@ func main() {
} }
// runtime has exited so the shim can also exit // runtime has exited so the shim can also exit
if exitShim { if exitShim {
p.delete()
p.Wait() p.Wait()
return return
} }

4
supervisor/sort_test.go
View file

@ -57,6 +57,10 @@ func (p *testProcess) Close() error {
return nil return nil
} }
func (p *testProcess) State() runtime.State {
return runtime.Running
}
func TestSortProcesses(t *testing.T) { func TestSortProcesses(t *testing.T) {
p := []runtime.Process{ p := []runtime.Process{
&testProcess{"ls"}, &testProcess{"ls"},