Merge pull request #94701 from Huang-Wei/rm-disablePreemption

Remove field disablePreemption from internal scheduler codebase
This commit is contained in:
Kubernetes Prow Robot 2020-09-10 22:14:14 -07:00 committed by GitHub
commit bd39d3933b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 15 deletions

View File

@ -286,7 +286,6 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
emptySnapshot,
extenders,
informerFactory.Core().V1().PersistentVolumeClaims().Lister(),
false,
schedulerapi.DefaultPercentageOfNodesToScore)
podIgnored := &v1.Pod{}
result, err := scheduler.Schedule(context.Background(), prof, framework.NewCycleState(), podIgnored)

View File

@ -120,7 +120,6 @@ type genericScheduler struct {
extenders []framework.Extender
nodeInfoSnapshot *internalcache.Snapshot
pvcLister corelisters.PersistentVolumeClaimLister
disablePreemption bool
percentageOfNodesToScore int32
nextStartNodeIndex int
}
@ -630,14 +629,12 @@ func NewGenericScheduler(
nodeInfoSnapshot *internalcache.Snapshot,
extenders []framework.Extender,
pvcLister corelisters.PersistentVolumeClaimLister,
disablePreemption bool,
percentageOfNodesToScore int32) ScheduleAlgorithm {
return &genericScheduler{
cache: cache,
extenders: extenders,
nodeInfoSnapshot: nodeInfoSnapshot,
pvcLister: pvcLister,
disablePreemption: disablePreemption,
percentageOfNodesToScore: percentageOfNodesToScore,
}
}

View File

@ -750,7 +750,6 @@ func TestGenericScheduler(t *testing.T) {
snapshot,
[]framework.Extender{},
pvcLister,
false,
schedulerapi.DefaultPercentageOfNodesToScore)
result, err := scheduler.Schedule(context.Background(), prof, framework.NewCycleState(), test.pod)
if !reflect.DeepEqual(err, test.wErr) {
@ -776,7 +775,7 @@ func makeScheduler(nodes []*v1.Node) *genericScheduler {
s := NewGenericScheduler(
cache,
emptySnapshot,
nil, nil, false,
nil, nil,
schedulerapi.DefaultPercentageOfNodesToScore)
cache.UpdateSnapshot(s.(*genericScheduler).nodeInfoSnapshot)
return s.(*genericScheduler)
@ -1071,7 +1070,6 @@ func TestZeroRequest(t *testing.T) {
emptySnapshot,
[]framework.Extender{},
nil,
false,
schedulerapi.DefaultPercentageOfNodesToScore).(*genericScheduler)
scheduler.nodeInfoSnapshot = snapshot

View File

@ -68,9 +68,6 @@ type Configurator struct {
schedulerCache internalcache.Cache
// Disable pod preemption or not.
disablePreemption bool
// Always check all predicates even if the middle of one predicate fails.
alwaysCheckAllPredicates bool
@ -184,7 +181,6 @@ func (c *Configurator) create() (*Scheduler, error) {
c.nodeInfoSnapshot,
extenders,
c.informerFactory.Core().V1().PersistentVolumeClaims().Lister(),
c.disablePreemption,
c.percentageOfNodesToScore,
)

View File

@ -52,7 +52,6 @@ import (
)
const (
disablePodPreemption = false
podInitialBackoffDurationSeconds = 1
podMaxBackoffDurationSeconds = 10
testSchedulerName = "test-scheduler"
@ -453,7 +452,6 @@ func newConfigFactoryWithFrameworkRegistry(
return &Configurator{
client: client,
informerFactory: informerFactory,
disablePreemption: disablePodPreemption,
percentageOfNodesToScore: schedulerapi.DefaultPercentageOfNodesToScore,
podInitialBackoffSeconds: podInitialBackoffDurationSeconds,
podMaxBackoffSeconds: podMaxBackoffDurationSeconds,

View File

@ -825,7 +825,6 @@ func setupTestScheduler(queuedPodStore *clientcache.FIFO, scache internalcache.C
internalcache.NewEmptySnapshot(),
[]framework.Extender{},
informerFactory.Core().V1().PersistentVolumeClaims().Lister(),
false,
schedulerapi.DefaultPercentageOfNodesToScore,
)
@ -1174,7 +1173,6 @@ func TestSchedulerBinding(t *testing.T) {
nil,
test.extenders,
nil,
false,
0,
)
sched := Scheduler{