Skip to content

Commit 2daad0b

Browse files
authored
Merge pull request kubernetes#78259 from tedyu/non-ignorable-extenders
Put non-ignorable extenders ahead of ignorable extenders
2 parents 01f6e68 + 3d07221 commit 2daad0b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pkg/scheduler/factory/factory.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,19 +387,26 @@ func (c *configFactory) CreateFromConfig(policy schedulerapi.Policy) (*Config, e
387387
var extenders []algorithm.SchedulerExtender
388388
if len(policy.ExtenderConfigs) != 0 {
389389
ignoredExtendedResources := sets.NewString()
390+
var ignorableExtenders []algorithm.SchedulerExtender
390391
for ii := range policy.ExtenderConfigs {
391392
klog.V(2).Infof("Creating extender with config %+v", policy.ExtenderConfigs[ii])
392393
extender, err := core.NewHTTPExtender(&policy.ExtenderConfigs[ii])
393394
if err != nil {
394395
return nil, err
395396
}
396-
extenders = append(extenders, extender)
397+
if !extender.IsIgnorable() {
398+
extenders = append(extenders, extender)
399+
} else {
400+
ignorableExtenders = append(ignorableExtenders, extender)
401+
}
397402
for _, r := range policy.ExtenderConfigs[ii].ManagedResources {
398403
if r.IgnoredByScheduler {
399404
ignoredExtendedResources.Insert(string(r.Name))
400405
}
401406
}
402407
}
408+
// place ignorable extenders to the tail of extenders
409+
extenders = append(extenders, ignorableExtenders...)
403410
predicates.RegisterPredicateMetadataProducerWithExtendedResourceOptions(ignoredExtendedResources)
404411
}
405412
// Providing HardPodAffinitySymmetricWeight in the policy config is the new and preferred way of providing the value.

0 commit comments

Comments
 (0)