Achilleas Tzenetopoulos 5 years ago
parent
commit
cb14858ef6

+ 3 - 3
kubernetes-v1.15.4/pkg/scheduler/algorithm/priorities/custom_resource_allocation.go

@@ -128,10 +128,10 @@ func onlyNrg(metrics map[string]float64) float64 {
 	return 1 / metrics["procnrg"]
 }
 
-func calculateScore(results map[string]float64,
+func calculateScore(si scorerInput,
 	logicFn func(scorerInput) float64) float64 {
 
-	res := logicFn(scorerInput{metrics: results})
+	res := logicFn(si)
 	//klog.Infof("Has score (in float) %v\n", res)
 
 	return res
@@ -226,7 +226,7 @@ func customResourceScorer(nodeName string) (float64, error) {
 			klog.Infof("Error in querying or calculating average: %v", err.Error())
 			return 0, nil
 		}
-		res := calculateScore(results, customScoreFn)
+		res := calculateScore(scorerInput{metrics: results}, customScoreFn)
 
 		// Select Node
 

+ 2 - 2
kubernetes-v1.15.4/pkg/scheduler/algorithm/priorities/node_selection.go

@@ -125,7 +125,7 @@ type scorerInput struct {
 }
 
 func OneScorer(si scorerInput) float64 {
-	return si.metrics[si.metricName]
+	return 1 - si.metrics[si.metricName]
 }
 
 // func customScoreFn(metrics map[string]float64) float64 {
@@ -270,7 +270,7 @@ func nodeSelectionScorer(nodeName string) (float64, error) {
 			return 0, nil
 		}
 
-		res := calculateScore(results, OneScorer)
+		res := calculateScore(scorerInput{metricName: "c6res", metrics: results}, OneScorer)
 
 		// Select Node