From bd4167d149eb3ab41cc94b9a569be16a8db03f43 Mon Sep 17 00:00:00 2001 From: zouyee Date: Sat, 19 Oct 2019 22:43:15 +0800 Subject: [PATCH] remove unused meta and rename lablance_allocated Signed-off-by: Zou Nengren --- pkg/scheduler/framework/plugins/noderesources/BUILD | 4 ++-- .../{balance_allocated.go => balanced_allocation.go} | 5 ++--- ...balance_allocated_test.go => balanced_allocation_test.go} | 0 .../framework/plugins/noderesources/least_allocated.go | 5 ++--- .../framework/plugins/noderesources/most_allocated.go | 5 ++--- 5 files changed, 8 insertions(+), 11 deletions(-) rename pkg/scheduler/framework/plugins/noderesources/{balance_allocated.go => balanced_allocation.go} (93%) rename pkg/scheduler/framework/plugins/noderesources/{balance_allocated_test.go => balanced_allocation_test.go} (100%) diff --git a/pkg/scheduler/framework/plugins/noderesources/BUILD b/pkg/scheduler/framework/plugins/noderesources/BUILD index 0f1f47da301..81ab961bf00 100644 --- a/pkg/scheduler/framework/plugins/noderesources/BUILD +++ b/pkg/scheduler/framework/plugins/noderesources/BUILD @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = [ - "balance_allocated.go", + "balanced_allocation.go", "least_allocated.go", "most_allocated.go", "node_resources.go", @@ -41,7 +41,7 @@ filegroup( go_test( name = "go_default_test", srcs = [ - "balance_allocated_test.go", + "balanced_allocation_test.go", "least_allocated_test.go", "most_allocated_test.go", "node_resources_test.go", diff --git a/pkg/scheduler/framework/plugins/noderesources/balance_allocated.go b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation.go similarity index 93% rename from pkg/scheduler/framework/plugins/noderesources/balance_allocated.go rename to pkg/scheduler/framework/plugins/noderesources/balanced_allocation.go index 5e1996f61c9..2ee23724f36 100644 --- a/pkg/scheduler/framework/plugins/noderesources/balance_allocated.go +++ b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation.go @@ -49,9 +49,8 @@ func (ba *BalancedAllocation) Score(ctx context.Context, state *framework.CycleS if !exist { return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName)) } - meta := migration.PriorityMetadata(state) - - s, err := priorities.BalancedResourceAllocationMap(pod, meta, nodeInfo) + // BalancedResourceAllocationMap does not use priority metadata, hence we pass nil here + s, err := priorities.BalancedResourceAllocationMap(pod, nil, nodeInfo) return s.Score, migration.ErrorToFrameworkStatus(err) } diff --git a/pkg/scheduler/framework/plugins/noderesources/balance_allocated_test.go b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go similarity index 100% rename from pkg/scheduler/framework/plugins/noderesources/balance_allocated_test.go rename to pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go diff --git a/pkg/scheduler/framework/plugins/noderesources/least_allocated.go b/pkg/scheduler/framework/plugins/noderesources/least_allocated.go index d5d60fb763b..b1c59923ece 100644 --- a/pkg/scheduler/framework/plugins/noderesources/least_allocated.go +++ b/pkg/scheduler/framework/plugins/noderesources/least_allocated.go @@ -48,9 +48,8 @@ func (la *LeastAllocated) Score(ctx context.Context, state *framework.CycleState if !exist { return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName)) } - meta := migration.PriorityMetadata(state) - - s, err := priorities.LeastRequestedPriorityMap(pod, meta, nodeInfo) + // LeastRequestedPriorityMap does not use priority metadata, hence we pass nil here + s, err := priorities.LeastRequestedPriorityMap(pod, nil, nodeInfo) return s.Score, migration.ErrorToFrameworkStatus(err) } diff --git a/pkg/scheduler/framework/plugins/noderesources/most_allocated.go b/pkg/scheduler/framework/plugins/noderesources/most_allocated.go index 4ad4dfe3565..00d1b11b60d 100644 --- a/pkg/scheduler/framework/plugins/noderesources/most_allocated.go +++ b/pkg/scheduler/framework/plugins/noderesources/most_allocated.go @@ -48,9 +48,8 @@ func (ma *MostAllocated) Score(ctx context.Context, state *framework.CycleState, if !exist { return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName)) } - meta := migration.PriorityMetadata(state) - - s, err := priorities.MostRequestedPriorityMap(pod, meta, nodeInfo) + // MostRequestedPriorityMap does not use priority metadata, hence we pass nil here + s, err := priorities.MostRequestedPriorityMap(pod, nil, nodeInfo) return s.Score, migration.ErrorToFrameworkStatus(err) }