craigcondit commented on a change in pull request #310:
URL:
https://github.com/apache/incubator-yunikorn-k8shim/pull/310#discussion_r731062076
##########
File path: pkg/cache/context.go
##########
@@ -75,9 +77,15 @@ func NewContext(apis client.APIProvider) *Context {
// init the controllers and plugins (need the cache)
ctx.nodes = newSchedulerNodes(apis.GetAPIs().SchedulerAPI,
ctx.schedulerCache)
- /* FUTURE YUNIKORN-872 replace this with predicateManager initilization
in YUNIKORN-874
- ctx.predictor = plugin.NewPredictor(schedulercache.GetPluginArgs(),
apis.IsTestingMode())
- */
+ // create the predicate manager
+ if !apis.IsTestingMode() {
+ sharedLister := support.NewSharedLister(ctx.schedulerCache)
+ k8sClient :=
client.NewKubeClient(conf.GetSchedulerConf().KubeConfig)
+ clientSet := k8sClient.GetClientSet()
+ informerFactory :=
informers.NewSharedInformerFactory(clientSet, 0)
Review comment:
Updated PR.
##########
File path: pkg/plugin/predicates/predicate_manager.go
##########
@@ -0,0 +1,394 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package predicates
+
+import (
+ "context"
+ "errors"
+ "fmt"
+
+ "go.uber.org/zap"
+ v1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/kube-scheduler/config/v1beta1"
+ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
+ apiConfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
+ "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
+ "k8s.io/kubernetes/pkg/scheduler/framework"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeunschedulable"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/podtopologyspread"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/tainttoleration"
+ fwruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
+
+ "github.com/apache/incubator-yunikorn-core/pkg/log"
+)
+
+type PredicateManager interface {
+ Predicates(pod *v1.Pod, node *framework.NodeInfo, allocate bool)
(plugin string, error error)
+}
+
+var _ PredicateManager = &predicateManagerImpl{}
+
+var configDecoder = scheme.Codecs.UniversalDecoder()
+
+type predicateManagerImpl struct {
+ reservationPreFilters *[]framework.PreFilterPlugin
+ allocationPreFilters *[]framework.PreFilterPlugin
+ reservationFilters *[]framework.FilterPlugin
+ allocationFilters *[]framework.FilterPlugin
+}
+
+func (p *predicateManagerImpl) Predicates(pod *v1.Pod, node
*framework.NodeInfo, allocate bool) (plugin string, error error) {
+ if allocate {
+ return p.predicatesAllocate(pod, node)
+ }
+ return p.predicatesReserve(pod, node)
+}
+
+func (p *predicateManagerImpl) predicatesReserve(pod *v1.Pod, node
*framework.NodeInfo) (plugin string, error error) {
+ ctx := context.TODO()
+ state := framework.NewCycleState()
+ return p.podFitsNode(ctx, state, *p.reservationPreFilters,
*p.reservationFilters, pod, node)
+}
+
+func (p *predicateManagerImpl) predicatesAllocate(pod *v1.Pod, node
*framework.NodeInfo) (plugin string, error error) {
+ ctx := context.TODO()
+ state := framework.NewCycleState()
+ return p.podFitsNode(ctx, state, *p.allocationPreFilters,
*p.allocationFilters, pod, node)
+}
+
+func (p *predicateManagerImpl) podFitsNode(ctx context.Context, state
*framework.CycleState, preFilters []framework.PreFilterPlugin, filters
[]framework.FilterPlugin, pod *v1.Pod, node *framework.NodeInfo) (plugin
string, error error) {
+ // Run "prefilter" plugins.
+ s, plugin := p.runPreFilterPlugins(ctx, state, preFilters, pod)
+ if !s.IsSuccess() {
+ if !s.IsUnschedulable() {
+ return plugin, s.AsError()
+ }
+ return plugin, errors.New("pod is unschedulable")
+ }
+
+ // Run "filter" plugins on node
+ statuses, plugin := p.runFilterPlugins(ctx, filters, state, pod, node)
+ s = statuses.Merge()
+ if !s.IsSuccess() {
+ if !s.IsUnschedulable() {
+ return plugin, s.AsError()
+ }
+ return plugin, errors.New("node is unschedulable")
+ }
+ return "", nil
+}
+
+func (p *predicateManagerImpl) runPreFilterPlugins(ctx context.Context, state
*framework.CycleState, plugins []framework.PreFilterPlugin, pod *v1.Pod)
(status *framework.Status, plugin string) {
+ for _, pl := range plugins {
+ status = p.runPreFilterPlugin(ctx, pl, state, pod)
+ if !status.IsSuccess() {
+ if status.IsUnschedulable() {
+ return status, plugin
Review comment:
Updated PR.
##########
File path: pkg/plugin/predicates/predicate_manager.go
##########
@@ -0,0 +1,394 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package predicates
+
+import (
+ "context"
+ "errors"
+ "fmt"
+
+ "go.uber.org/zap"
+ v1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/kube-scheduler/config/v1beta1"
+ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
+ apiConfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
+ "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
+ "k8s.io/kubernetes/pkg/scheduler/framework"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeunschedulable"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/podtopologyspread"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/tainttoleration"
+ fwruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
+
+ "github.com/apache/incubator-yunikorn-core/pkg/log"
+)
+
+type PredicateManager interface {
+ Predicates(pod *v1.Pod, node *framework.NodeInfo, allocate bool)
(plugin string, error error)
+}
+
+var _ PredicateManager = &predicateManagerImpl{}
+
+var configDecoder = scheme.Codecs.UniversalDecoder()
+
+type predicateManagerImpl struct {
+ reservationPreFilters *[]framework.PreFilterPlugin
+ allocationPreFilters *[]framework.PreFilterPlugin
+ reservationFilters *[]framework.FilterPlugin
+ allocationFilters *[]framework.FilterPlugin
+}
+
+func (p *predicateManagerImpl) Predicates(pod *v1.Pod, node
*framework.NodeInfo, allocate bool) (plugin string, error error) {
+ if allocate {
+ return p.predicatesAllocate(pod, node)
+ }
+ return p.predicatesReserve(pod, node)
+}
+
+func (p *predicateManagerImpl) predicatesReserve(pod *v1.Pod, node
*framework.NodeInfo) (plugin string, error error) {
+ ctx := context.TODO()
+ state := framework.NewCycleState()
+ return p.podFitsNode(ctx, state, *p.reservationPreFilters,
*p.reservationFilters, pod, node)
+}
+
+func (p *predicateManagerImpl) predicatesAllocate(pod *v1.Pod, node
*framework.NodeInfo) (plugin string, error error) {
+ ctx := context.TODO()
+ state := framework.NewCycleState()
+ return p.podFitsNode(ctx, state, *p.allocationPreFilters,
*p.allocationFilters, pod, node)
+}
+
+func (p *predicateManagerImpl) podFitsNode(ctx context.Context, state
*framework.CycleState, preFilters []framework.PreFilterPlugin, filters
[]framework.FilterPlugin, pod *v1.Pod, node *framework.NodeInfo) (plugin
string, error error) {
+ // Run "prefilter" plugins.
+ s, plugin := p.runPreFilterPlugins(ctx, state, preFilters, pod)
+ if !s.IsSuccess() {
+ if !s.IsUnschedulable() {
+ return plugin, s.AsError()
+ }
+ return plugin, errors.New("pod is unschedulable")
+ }
+
+ // Run "filter" plugins on node
+ statuses, plugin := p.runFilterPlugins(ctx, filters, state, pod, node)
+ s = statuses.Merge()
+ if !s.IsSuccess() {
+ if !s.IsUnschedulable() {
+ return plugin, s.AsError()
+ }
+ return plugin, errors.New("node is unschedulable")
+ }
+ return "", nil
+}
+
+func (p *predicateManagerImpl) runPreFilterPlugins(ctx context.Context, state
*framework.CycleState, plugins []framework.PreFilterPlugin, pod *v1.Pod)
(status *framework.Status, plugin string) {
+ for _, pl := range plugins {
+ status = p.runPreFilterPlugin(ctx, pl, state, pod)
+ if !status.IsSuccess() {
+ if status.IsUnschedulable() {
+ return status, plugin
+ }
+ err := status.AsError()
+ log.Logger().Error("failed running PreFilter plugin",
+ zap.String("pluginName", pl.Name()),
+ zap.String("pod", fmt.Sprintf("%s/%s",
pod.Namespace, pod.Name)),
+ zap.Error(err))
+ return framework.AsStatus(fmt.Errorf("running PreFilter
plugin %q: %w", pl.Name(), err)), plugin
+ }
+ }
+
+ return nil, ""
+}
+
+func (p *predicateManagerImpl) runPreFilterPlugin(ctx context.Context, pl
framework.PreFilterPlugin, state *framework.CycleState, pod *v1.Pod)
*framework.Status {
+ return pl.PreFilter(ctx, state, pod)
+}
+
+func (p *predicateManagerImpl) runFilterPlugins(ctx context.Context, plugins
[]framework.FilterPlugin, state *framework.CycleState, pod *v1.Pod, nodeInfo
*framework.NodeInfo) (status framework.PluginToStatus, plugin string) {
+ statuses := make(framework.PluginToStatus)
+ plugin = ""
+ for _, pl := range plugins {
+ pluginStatus := p.runFilterPlugin(ctx, pl, state, pod, nodeInfo)
+ if !pluginStatus.IsSuccess() {
+ if plugin == "" {
+ plugin = pl.Name()
+ }
+ if !pluginStatus.IsUnschedulable() {
+ // Filter plugins are not supposed to return
any status other than
+ // Success or Unschedulable.
+ errStatus :=
framework.NewStatus(framework.Error, fmt.Sprintf("running %q filter plugin for
pod %q: %v", pl.Name(), pod.Name, pluginStatus.Message()))
+ log.Logger().Error("failed running Filter
plugin",
+ zap.String("pluginName", pl.Name()),
+ zap.String("pod", fmt.Sprintf("%s/%s",
pod.Namespace, pod.Name)),
+ zap.String("message",
pluginStatus.Message()))
+ return map[string]*framework.Status{pl.Name():
errStatus}, pl.Name()
+ }
+ statuses[pl.Name()] = pluginStatus
+ }
+ }
+ return statuses, plugin
+}
+
+func (p *predicateManagerImpl) runFilterPlugin(ctx context.Context, pl
framework.FilterPlugin, state *framework.CycleState, pod *v1.Pod, nodeInfo
*framework.NodeInfo) *framework.Status {
+ return pl.Filter(ctx, state, pod, nodeInfo)
+}
+
+func NewPredicateManager(handle framework.Handle) PredicateManager {
+ /*
+ Default K8S plugins as of 1.20 that implement PreFilter:
+ NodeResourcesFit
+ NodePorts
+ PodTopologySpread
+ InterPodAffinity
+ VolumeBinding
+ */
+
+ // run only the simpler PreFilter plugins during reservation phase
+ reservationPreFilters := map[string]bool{
+ noderesources.FitName: true,
Review comment:
Updated PR.
##########
File path: pkg/plugin/predicates/predicate_manager.go
##########
@@ -0,0 +1,394 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package predicates
+
+import (
+ "context"
+ "errors"
+ "fmt"
+
+ "go.uber.org/zap"
+ v1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/kube-scheduler/config/v1beta1"
+ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
+ apiConfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
+ "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
+ "k8s.io/kubernetes/pkg/scheduler/framework"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeunschedulable"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/podtopologyspread"
+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/tainttoleration"
+ fwruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
+
+ "github.com/apache/incubator-yunikorn-core/pkg/log"
+)
+
+type PredicateManager interface {
+ Predicates(pod *v1.Pod, node *framework.NodeInfo, allocate bool)
(plugin string, error error)
+}
+
+var _ PredicateManager = &predicateManagerImpl{}
+
+var configDecoder = scheme.Codecs.UniversalDecoder()
+
+type predicateManagerImpl struct {
+ reservationPreFilters *[]framework.PreFilterPlugin
+ allocationPreFilters *[]framework.PreFilterPlugin
+ reservationFilters *[]framework.FilterPlugin
+ allocationFilters *[]framework.FilterPlugin
+}
+
+func (p *predicateManagerImpl) Predicates(pod *v1.Pod, node
*framework.NodeInfo, allocate bool) (plugin string, error error) {
+ if allocate {
+ return p.predicatesAllocate(pod, node)
+ }
+ return p.predicatesReserve(pod, node)
+}
+
+func (p *predicateManagerImpl) predicatesReserve(pod *v1.Pod, node
*framework.NodeInfo) (plugin string, error error) {
+ ctx := context.TODO()
+ state := framework.NewCycleState()
+ return p.podFitsNode(ctx, state, *p.reservationPreFilters,
*p.reservationFilters, pod, node)
+}
+
+func (p *predicateManagerImpl) predicatesAllocate(pod *v1.Pod, node
*framework.NodeInfo) (plugin string, error error) {
+ ctx := context.TODO()
+ state := framework.NewCycleState()
+ return p.podFitsNode(ctx, state, *p.allocationPreFilters,
*p.allocationFilters, pod, node)
+}
+
+func (p *predicateManagerImpl) podFitsNode(ctx context.Context, state
*framework.CycleState, preFilters []framework.PreFilterPlugin, filters
[]framework.FilterPlugin, pod *v1.Pod, node *framework.NodeInfo) (plugin
string, error error) {
+ // Run "prefilter" plugins.
+ s, plugin := p.runPreFilterPlugins(ctx, state, preFilters, pod)
+ if !s.IsSuccess() {
+ if !s.IsUnschedulable() {
+ return plugin, s.AsError()
+ }
+ return plugin, errors.New("pod is unschedulable")
+ }
+
+ // Run "filter" plugins on node
+ statuses, plugin := p.runFilterPlugins(ctx, filters, state, pod, node)
+ s = statuses.Merge()
+ if !s.IsSuccess() {
+ if !s.IsUnschedulable() {
+ return plugin, s.AsError()
+ }
+ return plugin, errors.New("node is unschedulable")
+ }
+ return "", nil
+}
+
+func (p *predicateManagerImpl) runPreFilterPlugins(ctx context.Context, state
*framework.CycleState, plugins []framework.PreFilterPlugin, pod *v1.Pod)
(status *framework.Status, plugin string) {
+ for _, pl := range plugins {
+ status = p.runPreFilterPlugin(ctx, pl, state, pod)
+ if !status.IsSuccess() {
+ if status.IsUnschedulable() {
+ return status, plugin
+ }
+ err := status.AsError()
+ log.Logger().Error("failed running PreFilter plugin",
+ zap.String("pluginName", pl.Name()),
+ zap.String("pod", fmt.Sprintf("%s/%s",
pod.Namespace, pod.Name)),
+ zap.Error(err))
+ return framework.AsStatus(fmt.Errorf("running PreFilter
plugin %q: %w", pl.Name(), err)), plugin
+ }
+ }
+
+ return nil, ""
+}
+
+func (p *predicateManagerImpl) runPreFilterPlugin(ctx context.Context, pl
framework.PreFilterPlugin, state *framework.CycleState, pod *v1.Pod)
*framework.Status {
+ return pl.PreFilter(ctx, state, pod)
+}
+
+func (p *predicateManagerImpl) runFilterPlugins(ctx context.Context, plugins
[]framework.FilterPlugin, state *framework.CycleState, pod *v1.Pod, nodeInfo
*framework.NodeInfo) (status framework.PluginToStatus, plugin string) {
+ statuses := make(framework.PluginToStatus)
+ plugin = ""
+ for _, pl := range plugins {
+ pluginStatus := p.runFilterPlugin(ctx, pl, state, pod, nodeInfo)
+ if !pluginStatus.IsSuccess() {
+ if plugin == "" {
+ plugin = pl.Name()
+ }
+ if !pluginStatus.IsUnschedulable() {
+ // Filter plugins are not supposed to return
any status other than
+ // Success or Unschedulable.
+ errStatus :=
framework.NewStatus(framework.Error, fmt.Sprintf("running %q filter plugin for
pod %q: %v", pl.Name(), pod.Name, pluginStatus.Message()))
+ log.Logger().Error("failed running Filter
plugin",
+ zap.String("pluginName", pl.Name()),
+ zap.String("pod", fmt.Sprintf("%s/%s",
pod.Namespace, pod.Name)),
+ zap.String("message",
pluginStatus.Message()))
+ return map[string]*framework.Status{pl.Name():
errStatus}, pl.Name()
+ }
+ statuses[pl.Name()] = pluginStatus
+ }
+ }
+ return statuses, plugin
+}
+
+func (p *predicateManagerImpl) runFilterPlugin(ctx context.Context, pl
framework.FilterPlugin, state *framework.CycleState, pod *v1.Pod, nodeInfo
*framework.NodeInfo) *framework.Status {
+ return pl.Filter(ctx, state, pod, nodeInfo)
+}
+
+func NewPredicateManager(handle framework.Handle) PredicateManager {
+ /*
+ Default K8S plugins as of 1.20 that implement PreFilter:
+ NodeResourcesFit
+ NodePorts
+ PodTopologySpread
+ InterPodAffinity
+ VolumeBinding
+ */
+
+ // run only the simpler PreFilter plugins during reservation phase
+ reservationPreFilters := map[string]bool{
+ noderesources.FitName: true,
+ nodeports.Name: true,
+ podtopologyspread.Name: true,
+ interpodaffinity.Name: true,
+ // VolumeBinding
+ }
+
+ // run all PreFilter plugins during allocation phase
+ allocationPreFilters := map[string]bool{
+ "*": true,
+ }
+
+ /*
+ Default K8S plugins as of 1.20 that implement Filter:
+ NodeUnschedulable
+ NodeName
+ TaintToleration
+ NodeAffinity
+ NodePorts
+ NodeResourcesFit
+ VolumeRestrictions
+ EBSLimits
+ GCEPDLimits
+ NodeVolumeLimits
+ AzureDiskLimits
+ VolumeBinding
+ VolumeZone
+ PodTopologySpread
+ InterPodAffinity
+ */
+
+ // run only the simpler Filter plugins during reservation phase
+ reservationFilters := map[string]bool{
+ nodeunschedulable.Name: true,
+ nodename.Name: true,
+ tainttoleration.Name: true,
+ nodeaffinity.Name: true,
+ nodeports.Name: true,
+ noderesources.FitName: true,
Review comment:
Updated PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
