Merge pull request #2032 from aaronlehmann/topology-tree-counts

Aaron Lehmann · web-flow · commit 9fdea50c1449 · 2017-03-13T17:55:47.000-07:00
scheduler: Correctly count tasks at bottom level of decision tree
diff --git a/manager/scheduler/nodeset.go b/manager/scheduler/nodeset.go
@@ -111,6 +111,10 @@ func (ns *nodeSet) tree(serviceID string, preferences []*api.PlacementPreference
 			tree = next
 		}
 
+		if node.ActiveTasksCountByService != nil {
+			tree.tasks += node.ActiveTasksCountByService[serviceID]
+		}
+
 		if tree.nodeHeap.lessFunc == nil {
 			tree.nodeHeap.lessFunc = nodeLess
 		}

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,10 @@ func (ns nodeSet) tree(serviceID string, preferences []api.PlacementPreference`
`111`	`111`	`tree = next`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ if node.ActiveTasksCountByService != nil {`
	`115`	`+ tree.tasks += node.ActiveTasksCountByService[serviceID]`
	`116`	`+ }`
	`117`	`+`
`114`	`118`	`if tree.nodeHeap.lessFunc == nil {`
`115`	`119`	`tree.nodeHeap.lessFunc = nodeLess`
`116`	`120`	`}`