Merge pull request #10449 from LK4D4/fix_race_monitor

Remove explicit setting of ExitCode
This commit is contained in:
Michael Crosby
2015-01-29 16:07:28 -08:00
-2
View File
@@ -168,12 +168,10 @@ func (m *containerMonitor) Start() error {
// we need to check this before reentering the loop because the waitForNextRestart could have
// been terminated by a request from a user
if m.shouldStop {
m.container.ExitCode = exitStatus.ExitCode
return err
}
continue
}
m.container.ExitCode = exitStatus.ExitCode
if exitStatus.OOMKilled {
m.container.LogEvent("oom")
}