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

Fix concurrency issue in node.updateContainer. 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-01-26 14:04:41 -08:00
parent cafbc6df28
commit dc43a156bd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/node.go
View File

@ -207,6 +207,8 @@ func (n *Node) RefreshContainer(ID string, full bool) error {
func (n *Node) updateContainer(c dockerclient.Container, containers map[string]*Container, full bool) (map[string]*Container, error) {
var container *Container
n.Lock()
if current, exists := n.containers[c.Id]; exists {
// The container is already known.
container = current
@ -220,6 +222,10 @@ func (n *Node) updateContainer(c dockerclient.Container, containers map[string]*
// Update its internal state.
container.Container = c
containers[container.Id] = container
// Release the lock here as the next step is slow.
n.Unlock()
// Update ContainerInfo.
if full {
@ -228,15 +234,10 @@ func (n *Node) updateContainer(c dockerclient.Container, containers map[string]*
return nil, err
}
container.Info = *info
// real CpuShares -> nb of CPUs
container.Info.Config.CpuShares = container.Info.Config.CpuShares / 100.0 * n.Cpus
}
// real CpuShares -> nb of CPUs
container.Info.Config.CpuShares = container.Info.Config.CpuShares / 100.0 * n.Cpus
n.Lock()
defer n.Unlock()
containers[container.Id] = container
return containers, nil
}