Node: Fix a bug in containers update.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

node.go

@@ -113,31 +113,33 @@ func (n *Node) updateContainers() error {
 		return err
 	}
 
-	n.Lock()
-	defer n.Unlock()
-
-	n.containers = make(map[string]*Container)
+	merged := make(map[string]*Container)
 	for _, c := range containers {
 		if current, exists := n.containers[c.Id]; exists {
 			// The container exists. Update its state.
 			current.Container = c
+			merged[current.Id] = current
 		} else {
 			// This is a brand new container.
 			container := &Container{}
 			container.Container = c
 			container.node = n
 
-			info, err := n.client.InspectContainer(container.Id)
+			info, err := n.client.InspectContainer(c.Id)
 			if err != nil {
 				log.Errorf("[%s] Unable to update state of %s", n.ID, c.Id)
 				continue
 			}
 			container.Info = *info
 
-			n.containers[container.Id] = container
+			merged[container.Id] = container
 		}
 	}
 
+	n.Lock()
+	n.containers = merged
+	n.Unlock()
+
 	log.Debugf("[%s] Updated state", n.ID)
 	return nil
 }
@@ -203,6 +205,7 @@ func (n *Node) Create(config *dockerclient.ContainerConfig, name string, pullIma
 
 	// Register the container immediately while waiting for a state refresh.
 	// Force a state refresh to pick up the newly created container.
+	log.Debug("Updating containers after create")
 	n.updateContainers()
 
 	return n.containers[id], nil

node_test.go

@@ -67,10 +67,9 @@ func TestNodeState(t *testing.T) {
 
 	// The client will return one container at first, then a second one will appear.
 	client.On("ListContainers", true, false).Return([]dockerclient.Container{{Id: "one"}}, nil).Once()
-	client.On("InspectContainer", mock.Anything).Return(&dockerclient.ContainerInfo{}, nil).Once()
+	client.On("InspectContainer", "one").Return(&dockerclient.ContainerInfo{}, nil).Once()
 	client.On("ListContainers", true, false).Return([]dockerclient.Container{{Id: "one"}, {Id: "two"}}, nil).Once()
-	client.On("InspectContainer", mock.Anything).Return(&dockerclient.ContainerInfo{}, nil).Once()
-	client.On("InspectContainer", mock.Anything).Return(&dockerclient.ContainerInfo{}, nil).Once()
+	client.On("InspectContainer", "two").Return(&dockerclient.ContainerInfo{}, nil).Once()
 
 	assert.NoError(t, node.connectClient(client))
 	assert.True(t, node.IsConnected())