Merge pull request #2122 from changlan/check-mesos-task-label

dashpole · web-flow · commit ba5704f4bcdf · 2018-12-04T17:53:42.000-08:00
Fix Panic: Check whether Mesos task labels are available
diff --git a/container/mesos/mesos_agent.go b/container/mesos/mesos_agent.go
@@ -113,8 +113,10 @@ func (s *state) fetchLabelsFromTask(exID string, labels map[string]string) error
 		}
 	}
 
-	for _, l := range t.Labels.Labels {
-		labels[l.Key] = *l.Value
+	if t.Labels != nil {
+		for _, l := range t.Labels.Labels {
+			labels[l.Key] = *l.Value
+		}
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,10 @@ func (s *state) fetchLabelsFromTask(exID string, labels map[string]string) error`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- for _, l := range t.Labels.Labels {`
`117`		`- labels[l.Key] = *l.Value`
	`116`	`+ if t.Labels != nil {`
	`117`	`+ for _, l := range t.Labels.Labels {`
	`118`	`+ labels[l.Key] = *l.Value`
	`119`	`+ }`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`return nil`