Merge pull request #1167 from christopherobin/bugfix-docker

Fix docker issues with global and dead tasks
traefik · Feb 23, 2017 · a7d5e6c · a7d5e6c
2 parents 28a4d65 + d342ae6
commit a7d5e6c
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 4 deletions.
diff --git a/provider/docker.go b/provider/docker.go
@@ -626,11 +626,12 @@ func (provider *Docker) listServices(ctx context.Context, dockerClient client.AP
 	for _, service := range serviceList {
 		dockerData := parseService(service, networkMap)
 		useSwarmLB, _ := strconv.ParseBool(provider.getIsBackendLBSwarm(dockerData))
+		isGlobalSvc := service.Spec.Mode.Global != nil
 
 		if useSwarmLB {
 			dockerDataList = append(dockerDataList, dockerData)
 		} else {
-			dockerDataListTasks, err = listTasks(ctx, dockerClient, service.ID, dockerData, networkMap)
+			dockerDataListTasks, err = listTasks(ctx, dockerClient, service.ID, dockerData, networkMap, isGlobalSvc)
 
 			for _, dockerDataTask := range dockerDataListTasks {
 				dockerDataList = append(dockerDataList, dockerDataTask)
@@ -675,9 +676,10 @@ func parseService(service swarmtypes.Service, networkMap map[string]*dockertypes
 }
 
 func listTasks(ctx context.Context, dockerClient client.APIClient, serviceID string,
-	serviceDockerData dockerData, networkMap map[string]*dockertypes.NetworkResource) ([]dockerData, error) {
+	serviceDockerData dockerData, networkMap map[string]*dockertypes.NetworkResource, isGlobalSvc bool) ([]dockerData, error) {
 	serviceIDFilter := filters.NewArgs()
 	serviceIDFilter.Add("service", serviceID)
+	serviceIDFilter.Add("desired-state", "running")
 	taskList, err := dockerClient.TaskList(ctx, dockertypes.TaskListOptions{Filter: serviceIDFilter})
 
 	if err != nil {
@@ -686,20 +688,24 @@ func listTasks(ctx context.Context, dockerClient client.APIClient, serviceID str
 	var dockerDataList []dockerData
 
 	for _, task := range taskList {
-		dockerData := parseTasks(task, serviceDockerData, networkMap)
+		dockerData := parseTasks(task, serviceDockerData, networkMap, isGlobalSvc)
 		dockerDataList = append(dockerDataList, dockerData)
 	}
 	return dockerDataList, err
 }
 
-func parseTasks(task swarmtypes.Task, serviceDockerData dockerData, networkMap map[string]*dockertypes.NetworkResource) dockerData {
+func parseTasks(task swarmtypes.Task, serviceDockerData dockerData, networkMap map[string]*dockertypes.NetworkResource, isGlobalSvc bool) dockerData {
 	dockerData := dockerData{
 		ServiceName:     serviceDockerData.Name,
 		Name:            serviceDockerData.Name + "." + strconv.Itoa(task.Slot),
 		Labels:          serviceDockerData.Labels,
 		NetworkSettings: networkSettings{},
 	}
 
+	if isGlobalSvc == true {
+		dockerData.Name = serviceDockerData.Name + "." + task.ID
+	}
+
 	if task.NetworksAttachments != nil {
 		dockerData.NetworkSettings.Networks = make(map[string]*networkData)
 		for _, virtualIP := range task.NetworksAttachments {

diff --git a/provider/docker_test.go b/provider/docker_test.go
@@ -2184,3 +2184,90 @@ func TestSwarmLoadDockerConfig(t *testing.T) {
 		}
 	}
 }
+
+func TestSwarmTaskParsing(t *testing.T) {
+	cases := []struct {
+		service       swarm.Service
+		tasks         []swarm.Task
+		isGlobalSvc   bool
+		expectedNames map[string]string
+		networks      map[string]*docker.NetworkResource
+	}{
+		{
+			service: swarm.Service{
+				Spec: swarm.ServiceSpec{
+					Annotations: swarm.Annotations{
+						Name: "container",
+					},
+				},
+			},
+			tasks: []swarm.Task{
+				{
+					ID:   "id1",
+					Slot: 1,
+				},
+				{
+					ID:   "id2",
+					Slot: 2,
+				},
+				{
+					ID:   "id3",
+					Slot: 3,
+				},
+			},
+			isGlobalSvc: false,
+			expectedNames: map[string]string{
+				"id1": "container.1",
+				"id2": "container.2",
+				"id3": "container.3",
+			},
+			networks: map[string]*docker.NetworkResource{
+				"1": {
+					Name: "foo",
+				},
+			},
+		},
+		{
+			service: swarm.Service{
+				Spec: swarm.ServiceSpec{
+					Annotations: swarm.Annotations{
+						Name: "container",
+					},
+				},
+			},
+			tasks: []swarm.Task{
+				{
+					ID: "id1",
+				},
+				{
+					ID: "id2",
+				},
+				{
+					ID: "id3",
+				},
+			},
+			isGlobalSvc: true,
+			expectedNames: map[string]string{
+				"id1": "container.id1",
+				"id2": "container.id2",
+				"id3": "container.id3",
+			},
+			networks: map[string]*docker.NetworkResource{
+				"1": {
+					Name: "foo",
+				},
+			},
+		},
+	}
+
+	for _, e := range cases {
+		dockerData := parseService(e.service, e.networks)
+
+		for _, task := range e.tasks {
+			taskDockerData := parseTasks(task, dockerData, map[string]*docker.NetworkResource{}, e.isGlobalSvc)
+			if !reflect.DeepEqual(taskDockerData.Name, e.expectedNames[task.ID]) {
+				t.Fatalf("expect %v, got %v", e.expectedNames[task.ID], taskDockerData.Name)
+			}
+		}
+	}
+}