github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

remove unused meta and rename lablance_allocated

Browse Source 
Signed-off-by: Zou Nengren <zouyee1989@gmail.com>
This commit is contained in:
zouyee 2019-10-19 22:43:15 +08:00
parent 408c9da2a6
commit bd4167d149
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/framework/plugins/noderesources/BUILD
View File

@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = [
"balance_allocated.go", "balanced_allocation.go",
"least_allocated.go", "least_allocated.go",
"most_allocated.go", "most_allocated.go",
"node_resources.go", "node_resources.go",
@ -41,7 +41,7 @@ filegroup(
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = [ srcs = [
"balance_allocated_test.go", "balanced_allocation_test.go",
"least_allocated_test.go", "least_allocated_test.go",
"most_allocated_test.go", "most_allocated_test.go",
"node_resources_test.go", "node_resources_test.go",

5
pkg/scheduler/framework/plugins/noderesources/balance_allocated.go → pkg/scheduler/framework/plugins/noderesources/balanced_allocation.go
View File

@ -49,9 +49,8 @@ func (ba *BalancedAllocation) Score(ctx context.Context, state *framework.CycleS
if !exist { if !exist {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName)) return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName))
} }
meta := migration.PriorityMetadata(state) // BalancedResourceAllocationMap does not use priority metadata, hence we pass nil here
s, err := priorities.BalancedResourceAllocationMap(pod, nil, nodeInfo)
s, err := priorities.BalancedResourceAllocationMap(pod, meta, nodeInfo)
return s.Score, migration.ErrorToFrameworkStatus(err) return s.Score, migration.ErrorToFrameworkStatus(err)
} }

0
pkg/scheduler/framework/plugins/noderesources/balance_allocated_test.go → pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go
View File

5
pkg/scheduler/framework/plugins/noderesources/least_allocated.go
View File

@ -48,9 +48,8 @@ func (la *LeastAllocated) Score(ctx context.Context, state *framework.CycleState
if !exist { if !exist {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName)) return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName))
} }
meta := migration.PriorityMetadata(state) // LeastRequestedPriorityMap does not use priority metadata, hence we pass nil here
s, err := priorities.LeastRequestedPriorityMap(pod, nil, nodeInfo)
s, err := priorities.LeastRequestedPriorityMap(pod, meta, nodeInfo)
return s.Score, migration.ErrorToFrameworkStatus(err) return s.Score, migration.ErrorToFrameworkStatus(err)
} }

5
pkg/scheduler/framework/plugins/noderesources/most_allocated.go
View File

@ -48,9 +48,8 @@ func (ma *MostAllocated) Score(ctx context.Context, state *framework.CycleState,
if !exist { if !exist {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName)) return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName))
} }
meta := migration.PriorityMetadata(state) // MostRequestedPriorityMap does not use priority metadata, hence we pass nil here
s, err := priorities.MostRequestedPriorityMap(pod, nil, nodeInfo)
s, err := priorities.MostRequestedPriorityMap(pod, meta, nodeInfo)
return s.Score, migration.ErrorToFrameworkStatus(err) return s.Score, migration.ErrorToFrameworkStatus(err)
} }