Bläddra i källkod

Merge pull request #10449 from LK4D4/fix_race_monitor

Remove explicit setting of ExitCode
Michael Crosby 10 år sedan
förälder
incheckning
144ae9b0c7
1 ändrade filer med 0 tillägg och 2 borttagningar
  1. 0 2
      daemon/monitor.go

+ 0 - 2
daemon/monitor.go

@@ -168,12 +168,10 @@ func (m *containerMonitor) Start() error {
 			// we need to check this before reentering the loop because the waitForNextRestart could have
 			// we need to check this before reentering the loop because the waitForNextRestart could have
 			// been terminated by a request from a user
 			// been terminated by a request from a user
 			if m.shouldStop {
 			if m.shouldStop {
-				m.container.ExitCode = exitStatus.ExitCode
 				return err
 				return err
 			}
 			}
 			continue
 			continue
 		}
 		}
-		m.container.ExitCode = exitStatus.ExitCode
 		if exitStatus.OOMKilled {
 		if exitStatus.OOMKilled {
 			m.container.LogEvent("oom")
 			m.container.LogEvent("oom")
 		}
 		}