Merge pull request #19917 from WeiZhang555/add-lock

Lock container when set state to restarting
Upstream-commit: 67d6154cc26cceccc554ebb54ae4dcbad44047e4
Component: engine

components/engine/container/monitor.go

@@ -218,7 +218,7 @@ func (m *containerMonitor) start() error {
 		m.resetMonitor(err == nil && exitStatus.ExitCode == 0)
 
 		if m.shouldRestart(exitStatus.ExitCode) {
-			m.container.SetRestarting(&exitStatus)
+			m.container.SetRestartingLocking(&exitStatus)
 			m.logEvent("die")
 			m.resetContainer(true)