Merge pull request #2168 from claire921/cleanup_predicates

Refactore calculateOccupancy in pkg/scheduler
This commit is contained in:
Daniel Smith 2014-11-05 10:21:34 -08:00
commit 1b9dbe10d9

View File

@ -34,9 +34,8 @@ func calculatePercentage(requested, capacity int) int {
func calculateOccupancy(node api.Minion, pods []api.Pod) HostPriority {
totalCPU := 0
totalMemory := 0
for ix := range pods {
for cIx := range pods[ix].DesiredState.Manifest.Containers {
container := &(pods[ix].DesiredState.Manifest.Containers[cIx])
for _, pod := range pods {
for _, container := range pod.DesiredState.Manifest.Containers {
totalCPU += container.CPU
totalMemory += container.Memory
}