From 1d06117d02689e6a2c4f0edd3b4db130432c74cd Mon Sep 17 00:00:00 2001 From: Thor-wl <13164644535@163.com> Date: Sat, 16 Apr 2022 17:03:54 +0800 Subject: [PATCH] format the code to match CI Signed-off-by: Thor-wl <13164644535@163.com> --- pkg/scheduler/actions/preempt/preempt.go | 2 +- pkg/scheduler/actions/shuffle/fake_plugin.go | 5 +-- pkg/scheduler/actions/shuffle/shuffle.go | 1 + pkg/scheduler/framework/session_plugins.go | 43 -------------------- 4 files changed, 4 insertions(+), 47 deletions(-) diff --git a/pkg/scheduler/actions/preempt/preempt.go b/pkg/scheduler/actions/preempt/preempt.go index 9f519611e9e..b977f2bb456 100644 --- a/pkg/scheduler/actions/preempt/preempt.go +++ b/pkg/scheduler/actions/preempt/preempt.go @@ -276,7 +276,7 @@ func victimTasks(ssn *framework.Session) { tasks := make([]*api.TaskInfo, 0) victimTasksMap := ssn.VictimTasks(tasks) victimTasks := make([]*api.TaskInfo, 0) - for task, _ := range victimTasksMap { + for task := range victimTasksMap { victimTasks = append(victimTasks, task) } for _, victim := range victimTasks { diff --git a/pkg/scheduler/actions/shuffle/fake_plugin.go b/pkg/scheduler/actions/shuffle/fake_plugin.go index 61416b93078..5fbef087f87 100644 --- a/pkg/scheduler/actions/shuffle/fake_plugin.go +++ b/pkg/scheduler/actions/shuffle/fake_plugin.go @@ -39,13 +39,12 @@ func (fp *fakePlugin) Name() string { } func (fp *fakePlugin) OnSessionOpen(ssn *framework.Session) { - var lowPriority int32 - lowPriority = 10 + lowPriority := 10 victimTasksFn := func(candidates []*api.TaskInfo) []*api.TaskInfo { evicts := make([]*api.TaskInfo, 0) for _, task := range candidates { - if task.Priority == lowPriority { + if task.Priority == int32(lowPriority) { evicts = append(evicts, task) } } diff --git a/pkg/scheduler/actions/shuffle/shuffle.go b/pkg/scheduler/actions/shuffle/shuffle.go index e51b965c5b2..807932697fd 100644 --- a/pkg/scheduler/actions/shuffle/shuffle.go +++ b/pkg/scheduler/actions/shuffle/shuffle.go @@ -23,6 +23,7 @@ import ( ) const ( + // Shuffle Shffle indicates the action name Shuffle = "shuffle" ) diff --git a/pkg/scheduler/framework/session_plugins.go b/pkg/scheduler/framework/session_plugins.go index 12b19a35397..c738df58e29 100644 --- a/pkg/scheduler/framework/session_plugins.go +++ b/pkg/scheduler/framework/session_plugins.go @@ -443,49 +443,6 @@ func (ssn *Session) TargetJob(jobs []*api.JobInfo) *api.JobInfo { return nil } -// VictimTasks invoke ReservedNodes function of the plugins -//func (ssn *Session) VictimTasks() []*api.TaskInfo { -// var victims []*api.TaskInfo -// var init bool -// -// for _, tier := range ssn.Tiers { -// for _, plugin := range tier.Plugins { -// if !isEnabled(plugin.EnabledVictim) { -// continue -// } -// -// pf, found := ssn.victimTasksFns[plugin.Name] -// if !found { -// continue -// } -// candidates := pf() -// if !init { -// victims = candidates -// init = true -// } else { -// var intersection []*api.TaskInfo -// // Get intersection of victims and candidates. -// for _, v := range victims { -// for _, c := range candidates { -// if v.UID == c.UID { -// intersection = append(intersection, v) -// } -// } -// } -// -// // Update victims to intersection -// victims = intersection -// } -// } -// // Plugins in this tier made decision if victims is not nil -// if victims != nil { -// return victims -// } -// } -// -// return victims -//} - // VictimTasks returns the victims selected func (ssn *Session) VictimTasks(tasks []*api.TaskInfo) map[*api.TaskInfo]bool { // different filters may add the same task to victims, so use a map to remove duplicate tasks.