|
@@ -28,6 +28,7 @@ import (
|
|
|
|
|
|
"k8s.io/klog"
|
|
|
|
|
|
+ "github.com/iwita/kube-scheduler/customcache"
|
|
|
v1 "k8s.io/api/core/v1"
|
|
|
policy "k8s.io/api/policy/v1beta1"
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
@@ -39,7 +40,6 @@ import (
|
|
|
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
|
|
|
"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities"
|
|
|
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
|
|
|
- "k8s.io/kubernetes/pkg/scheduler/customcache"
|
|
|
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
|
|
|
internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache"
|
|
|
internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue"
|
|
@@ -303,7 +303,7 @@ func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister
|
|
|
tmp = append(tmp, key)
|
|
|
}
|
|
|
}
|
|
|
- for n := range tmp {
|
|
|
+ for _, n := range tmp {
|
|
|
if priorities.Sockets[n] == winningSocket {
|
|
|
socketNodes = append(socketNodes, n)
|
|
|
}
|
|
@@ -312,7 +312,8 @@ func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister
|
|
|
// Add pod's information (average metrics to the winning nodes metrics) and cache them
|
|
|
podName := pod.ObjectMeta.Name
|
|
|
|
|
|
- for n := range winningSocket {
|
|
|
+ for _, n := range socketNodes {
|
|
|
+ klog.Infof("Update Score for Node %v, using App: %v", n,podName)
|
|
|
numCores := len(priorities.Cores[n])
|
|
|
customcache.LabCache.AddAppMetrics(priorities.Applications[podName].Metrics, n, numCores)
|
|
|
}
|