docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1813 from dongluochen/enginePanic 

Lock engine to prevent read/write conflict on engine `containers` map
This commit is contained in:
Victor Vieux 2016-02-12 16:26:00 -08:00
parent 1fab0aed5a bfc556613b
commit ad232fcec6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/engine.go
View File

@ -585,7 +585,10 @@ func (e *Engine) refreshContainer(ID string, full bool) (*Container, error) {
} }
_, err = e.updateContainer(containers[0], e.containers, full) _, err = e.updateContainer(containers[0], e.containers, full)
return e.containers[containers[0].Id], err e.RLock()
container := e.containers[containers[0].Id]
e.RUnlock()
return container, err
} }
func (e *Engine) updateContainer(c dockerclient.Container, containers map[string]*Container, full bool) (map[string]*Container, error) { func (e *Engine) updateContainer(c dockerclient.Container, containers map[string]*Container, full bool) (map[string]*Container, error) {