Achilleas Tzenetopoulos %!s(int64=5) %!d(string=hai) anos
pai
achega
8b6aa2cd32

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

@@ -170,7 +170,8 @@ func customResourceScorer(nodeName string) (float64, error) {
 
 		//Apply heterogeneity
 		speed := links[Nodes[nodeName]][0] * links[Nodes[nodeName]][1]
-		res = res * float64(speed)
+		maxFreq := maxSpeed[Nodes[nodeName]]
+		res = res * float64(speed) * float64(maxFreq)
 
 		// Select Node
 
@@ -247,7 +248,8 @@ func customResourceScorer(nodeName string) (float64, error) {
 
 		//Apply heterogeneity
 		speed := links[Nodes[nodeName]][0] * links[Nodes[nodeName]][1]
-		res = res * float64(speed)
+		maxFreq := maxSpeed[Nodes[nodeName]]
+		res = res * float64(speed) * float64(maxFreq)
 
 		// Select Node
 

+ 5 - 0
kubernetes-v1.15.4/pkg/scheduler/algorithm/priorities/infrastructure.go

@@ -171,6 +171,11 @@ var links = map[string][]float32{
 	"c4766d29-4dc1-11ea-9d98-0242ac110002": []float32{2, 9.6},
 }
 
+var maxSpeed = map[string]float32{
+	"e77467ad-636e-4e7e-8bc9-53e46ae51da1": 2.9,
+	"c4766d29-4dc1-11ea-9d98-0242ac110002": 2.0,
+}
+
 var Sockets = map[string]int{
 	"kube-01": 1,
 	"kube-02": 0,