From 076f1638b869944e0cce64c3178a0a22c48499d1 Mon Sep 17 00:00:00 2001 From: Claire Li Date: Tue, 4 Nov 2014 21:44:44 -0800 Subject: [PATCH] Refactore calculateOccupancy in pkg/scheduler --- pkg/scheduler/priorities.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/scheduler/priorities.go b/pkg/scheduler/priorities.go index f2782c9cfc2..5fb3118a844 100644 --- a/pkg/scheduler/priorities.go +++ b/pkg/scheduler/priorities.go @@ -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 }