Merge pull request #1332 from weaveworks/1091-docker-rename

Support docker rename events
weaveworks · Apr 20, 2016 · 5cedfad · 5cedfad
2 parents 9eda278 + 81334cd
commit 5cedfad
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/client/app/scripts/charts/nodes-chart.js b/client/app/scripts/charts/nodes-chart.js
@@ -334,9 +334,6 @@ export default class NodesChart extends React.Component {
 
     const stateNodes = this.initNodes(props.nodes, state.nodes);
     const stateEdges = this.initEdges(props.nodes, stateNodes);
-    const nodeMetrics = stateNodes.map(node => makeMap({
-      metrics: node.get('metrics')
-    }));
     const nodeScale = this.getNodeScale(props.nodes, state.width, state.height);
     const nextState = { nodeScale };
 
@@ -356,12 +353,15 @@ export default class NodesChart extends React.Component {
     log(`graph layout took ${timedLayouter.time}ms`);
 
     // inject metrics and save coordinates for restore
-    const layoutNodes = graph.nodes
-      .mergeDeep(nodeMetrics)
+    let layoutNodes = graph.nodes
       .map(node => node.merge({
         px: node.get('x'),
         py: node.get('y')
       }));
+
+    // Re-apply in case layout runner's node cache applied stale node metadata
+    layoutNodes = layoutNodes.mergeDeep(stateNodes);
+
     const layoutEdges = graph.edges
       .map(edge => edge.set('ppoints', edge.get('points')));
 

diff --git a/probe/docker/registry.go b/probe/docker/registry.go
@@ -14,6 +14,7 @@ import (
 const (
 	CreateEvent  = "create"
 	DestroyEvent = "destroy"
+	RenameEvent  = "rename"
 	StartEvent   = "start"
 	DieEvent     = "die"
 	PauseEvent   = "pause"
@@ -238,7 +239,7 @@ func (r *registry) updateImages() error {
 
 func (r *registry) handleEvent(event *docker_client.APIEvents) {
 	switch event.Status {
-	case CreateEvent, StartEvent, DieEvent, DestroyEvent, PauseEvent, UnpauseEvent:
+	case CreateEvent, RenameEvent, StartEvent, DieEvent, DestroyEvent, PauseEvent, UnpauseEvent:
 		r.updateContainerState(event.ID)
 	}
 }

diff --git a/probe/docker/registry_test.go b/probe/docker/registry_test.go
@@ -203,9 +203,22 @@ var (
 			},
 		},
 	}
-	apiContainer1 = client.APIContainers{ID: "ping"}
-	apiContainer2 = client.APIContainers{ID: "wiff"}
-	apiImage1     = client.APIImages{ID: "baz", RepoTags: []string{"bang", "not-chosen"}}
+	renamedContainer = &client.Container{
+		ID:    "renamed",
+		Name:  "renamed",
+		Image: "baz",
+		State: client.State{Pid: 1, Running: true},
+		Config: &client.Config{
+			Labels: map[string]string{
+				"foo1": "bar1",
+				"foo2": "bar2",
+			},
+		},
+	}
+	apiContainer1       = client.APIContainers{ID: "ping"}
+	apiContainer2       = client.APIContainers{ID: "wiff"}
+	renamedAPIContainer = client.APIContainers{ID: "renamed"}
+	apiImage1           = client.APIImages{ID: "baz", RepoTags: []string{"bang", "not-chosen"}}
 )
 
 func newMockClient() *mockDockerClient {
@@ -350,5 +363,17 @@ func TestRegistryEvents(t *testing.T) {
 			want := []docker.Container{}
 			check(want)
 		}
+
+		{
+			mdc.Lock()
+			mdc.apiContainers = []client.APIContainers{renamedAPIContainer}
+			mdc.containers[renamedContainer.ID] = renamedContainer
+			mdc.Unlock()
+			mdc.send(&client.APIEvents{Status: docker.RenameEvent, ID: renamedContainer.ID})
+			runtime.Gosched()
+
+			want := []docker.Container{&mockContainer{renamedContainer}}
+			check(want)
+		}
 	})
 }