From 8f5416c1ecc6deb7fa0bad34c260c5cfeebc047c Mon Sep 17 00:00:00 2001
From: Wei Huang <wei.huang1@ibm.com>
Date: Sat, 6 Mar 2021 19:54:12 -0800
Subject: [PATCH] Revert "Surface more information about plugin scores in
 scheduler"

This reverts commit d09a841246f4874873e24699cce0697f1bfa4e3d.
---
 pkg/scheduler/core/generic_scheduler.go | 70 ++++---------------------
 1 file changed, 10 insertions(+), 60 deletions(-)

diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go
index b7375202e0d..ec22ca28e24 100644
--- a/pkg/scheduler/core/generic_scheduler.go
+++ b/pkg/scheduler/core/generic_scheduler.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"math/rand"
-	"sort"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -399,12 +398,6 @@ func (g *genericScheduler) findNodesThatPassExtenders(pod *v1.Pod, feasibleNodes
 	return feasibleNodes, nil
 }
 
-type pluginScores struct {
-	Plugin           string
-	Score            int64
-	AverageNodeScore float64
-}
-
 // prioritizeNodes prioritizes the nodes by running the score plugins,
 // which return a score for each node from the call to RunScorePlugins().
 // The scores from each plugin are added together to make the score for that node, then
@@ -442,8 +435,17 @@ func (g *genericScheduler) prioritizeNodes(
 		return nil, scoreStatus.AsError()
 	}
 
+	if klog.V(10).Enabled() {
+		for plugin, nodeScoreList := range scoresMap {
+			for _, nodeScore := range nodeScoreList {
+				klog.InfoS("Plugin scored node for pod", "pod", klog.KObj(pod), "plugin", plugin, "node", nodeScore.Name, "score", nodeScore.Score)
+			}
+		}
+	}
+
 	// Summarize all scores.
 	result := make(framework.NodeScoreList, 0, len(nodes))
+
 	for i := range nodes {
 		result = append(result, framework.NodeScore{Name: nodes[i].Name, Score: 0})
 		for j := range scoresMap {
@@ -451,10 +453,6 @@ func (g *genericScheduler) prioritizeNodes(
 		}
 	}
 
-	if klog.V(4).Enabled() {
-		logPluginScores(nodes, scoresMap, pod)
-	}
-
 	if len(g.extenders) != 0 && nodes != nil {
 		var mu sync.Mutex
 		var wg sync.WaitGroup
@@ -495,7 +493,7 @@ func (g *genericScheduler) prioritizeNodes(
 		}
 	}
 
-	if klog.V(4).Enabled() {
+	if klog.V(10).Enabled() {
 		for i := range result {
 			klog.InfoS("Calculated node's final score for pod", "pod", klog.KObj(pod), "node", result[i].Name, "score", result[i].Score)
 		}
@@ -503,54 +501,6 @@ func (g *genericScheduler) prioritizeNodes(
 	return result, nil
 }
 
-// logPluginScores adds summarized plugin score logging. The goal of this block is to show the highest scoring plugins on
-// each node, and the average score for those plugins across all nodes.
-func logPluginScores(nodes []*v1.Node, scoresMap framework.PluginToNodeScores, pod *v1.Pod) {
-	totalPluginScores := make(map[string]int64)
-	for j := range scoresMap {
-		for i := range nodes {
-			totalPluginScores[j] += scoresMap[j][i].Score
-		}
-	}
-	// Build a map of Nodes->PluginScores on that node
-	nodeToPluginScores := make(framework.PluginToNodeScores, len(nodes))
-	for _, node := range nodes {
-		nodeToPluginScores[node.Name] = make(framework.NodeScoreList, len(scoresMap))
-	}
-	// Convert the scoresMap (which contains Plugins->NodeScores) to the Nodes->PluginScores map
-	for plugin, nodeScoreList := range scoresMap {
-		for _, nodeScore := range nodeScoreList {
-			klog.V(10).InfoS("Plugin scored node for pod", "pod", klog.KObj(pod), "plugin", plugin, "node", nodeScore.Name, "score", nodeScore.Score)
-			nodeToPluginScores[nodeScore.Name] = append(nodeToPluginScores[nodeScore.Name], framework.NodeScore{Name: plugin, Score: nodeScore.Score})
-		}
-	}
-
-	for node, scores := range nodeToPluginScores {
-		// Get the top 3 scoring plugins for each node
-		sort.Slice(scores, func(i, j int) bool {
-			return scores[i].Score > scores[j].Score
-		})
-		var topScores []pluginScores
-		for _, score := range scores {
-			pluginScore := pluginScores{
-				Plugin:           score.Name,
-				Score:            score.Score,
-				AverageNodeScore: float64(totalPluginScores[score.Name]) / float64(len(nodes)),
-			}
-			topScores = append(topScores, pluginScore)
-			if len(topScores) == 3 {
-				break
-			}
-		}
-
-		klog.InfoS("Top 3 plugins for pod on node",
-			"pod", klog.KObj(pod),
-			"node", node,
-			"scores", topScores,
-		)
-	}
-}
-
 // NewGenericScheduler creates a genericScheduler object.
 func NewGenericScheduler(
 	cache internalcache.Cache,