Achilleas Tzenetopoulos 5 gadi atpakaļ
vecāks
revīzija
b736642736

+ 3 - 1
kubernetes-v1.15.4/pkg/scheduler/core/generic_scheduler.go

@@ -330,7 +330,9 @@ func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister
 	podName := pod.ObjectMeta.Name[0 : len(pod.ObjectMeta.Name)-19]
 
 	for _, n := range socketNodes {
-		win := n == host
+		if n == host {
+			win := true
+		}
 		klog.Infof("Update Score for Node %v, using App: %v", n, podName)
 		klog.Infof("App metrics: %v", priorities.Applications[podName].Metrics)
 		numCores := len(priorities.Cores[n])

+ 1 - 1
kubernetes-v1.15.4/pkg/scheduler/customcache/cache.go

@@ -164,7 +164,7 @@ func (c *MlabCache) AddAppMetrics(app map[string]float64, nodename string, numCo
 	//TODO
 	// handle c6res addition
 	if win {
-		c.Cache[nodename]["c6res"] -= (1 - app["c6res"]) / float64(100*numCores)
+		c.Cache[nodename]["c6res"] -= (100 - app["c6res"]) / float64(100*numCores)
 		if c.Cache[nodename]["c6res"] <= 0 {
 			c.Cache[nodename]["c6res"] = 0.00000001
 		}