Merge pull request kubernetes#86119 from haosdent/clean-e2e-framework-metrics

e2e: move funs of framework/metrics to e2e_node

Author: k8s-ci-robot

test/e2e/framework/metrics/BUILD

@@ -19,7 +19,6 @@ go_library(
         "metrics_grabber.go",
         "pod.go",
         "scheduler_metrics.go",
-        "scheduling.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e/framework/metrics",
     deps = [

test/e2e/framework/metrics/latencies.go

@@ -17,10 +17,7 @@ limitations under the License.
 package metrics
 
 import (
-	"math"
 	"time"
-
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 )
 
 const (
@@ -46,20 +43,3 @@ type LatencySlice []PodLatencyData
 func (a LatencySlice) Len() int           { return len(a) }
 func (a LatencySlice) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a LatencySlice) Less(i, j int) bool { return a[i].Latency < a[j].Latency }
-
-// ExtractLatencyMetrics returns latency metrics for each percentile(50th, 90th and 99th).
-func ExtractLatencyMetrics(latencies []PodLatencyData) LatencyMetric {
-	length := len(latencies)
-	perc50 := latencies[int(math.Ceil(float64(length*50)/100))-1].Latency
-	perc90 := latencies[int(math.Ceil(float64(length*90)/100))-1].Latency
-	perc99 := latencies[int(math.Ceil(float64(length*99)/100))-1].Latency
-	perc100 := latencies[length-1].Latency
-	return LatencyMetric{Perc50: perc50, Perc90: perc90, Perc99: perc99, Perc100: perc100}
-}
-
-// PrintLatencies outputs latencies to log with readable format.
-func PrintLatencies(latencies []PodLatencyData, header string) {
-	metrics := ExtractLatencyMetrics(latencies)
-	e2elog.Logf("10%% %s: %v", header, latencies[(len(latencies)*9)/10:])
-	e2elog.Logf("perc50: %v, perc90: %v, perc99: %v", metrics.Perc50, metrics.Perc90, metrics.Perc99)
-}

test/e2e/framework/metrics/scheduling.go

@@ -220,6 +220,7 @@ go_test(
             "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
             "//test/e2e/framework/config:go_default_library",
             "//test/e2e/framework/kubelet:go_default_library",
+            "//test/e2e/framework/log:go_default_library",
             "//test/e2e/framework/perf:go_default_library",
             "//test/e2e/generated:go_default_library",
             "//vendor/github.com/onsi/ginkgo/config:go_default_library",
@@ -235,6 +236,7 @@ go_test(
             "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
             "//test/e2e/framework/config:go_default_library",
             "//test/e2e/framework/kubelet:go_default_library",
+            "//test/e2e/framework/log:go_default_library",
             "//test/e2e/framework/perf:go_default_library",
             "//test/e2e/generated:go_default_library",
             "//vendor/github.com/onsi/ginkgo/config:go_default_library",

test/e2e_node/BUILD

@@ -20,6 +20,7 @@ package e2enode
 
 import (
 	"fmt"
+	"math"
 	"sort"
 	"strconv"
 	"sync"
@@ -36,6 +37,7 @@ import (
 	kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 
@@ -548,16 +550,33 @@ func verifyLatencyWithinThreshold(threshold, actual e2emetrics.LatencyMetric, me
 	return nil
 }
 
+// extractLatencyMetrics returns latency metrics for each percentile(50th, 90th and 99th).
+func extractLatencyMetrics(latencies []e2emetrics.PodLatencyData) e2emetrics.LatencyMetric {
+	length := len(latencies)
+	perc50 := latencies[int(math.Ceil(float64(length*50)/100))-1].Latency
+	perc90 := latencies[int(math.Ceil(float64(length*90)/100))-1].Latency
+	perc99 := latencies[int(math.Ceil(float64(length*99)/100))-1].Latency
+	perc100 := latencies[length-1].Latency
+	return e2emetrics.LatencyMetric{Perc50: perc50, Perc90: perc90, Perc99: perc99, Perc100: perc100}
+}
+
+// printLatencies outputs latencies to log with readable format.
+func printLatencies(latencies []e2emetrics.PodLatencyData, header string) {
+	metrics := extractLatencyMetrics(latencies)
+	e2elog.Logf("10%% %s: %v", header, latencies[(len(latencies)*9)/10:])
+	e2elog.Logf("perc50: %v, perc90: %v, perc99: %v", metrics.Perc50, metrics.Perc90, metrics.Perc99)
+}
+
 // logAndVerifyLatency verifies that whether pod creation latency satisfies the limit.
 func logAndVerifyLatency(batchLag time.Duration, e2eLags []e2emetrics.PodLatencyData, podStartupLimits e2emetrics.LatencyMetric,
 	podBatchStartupLimit time.Duration, testInfo map[string]string, isVerify bool) {
-	e2emetrics.PrintLatencies(e2eLags, "worst client e2e total latencies")
+	printLatencies(e2eLags, "worst client e2e total latencies")
 
 	// TODO(coufon): do not trust 'kubelet' metrics since they are not reset!
 	latencyMetrics, _ := getPodStartLatency(kubeletAddr)
 	framework.Logf("Kubelet Prometheus metrics (not reset):\n%s", framework.PrettyPrintJSON(latencyMetrics))
 
-	podStartupLatency := e2emetrics.ExtractLatencyMetrics(e2eLags)
+	podStartupLatency := extractLatencyMetrics(e2eLags)
 
 	// log latency perf data
 	logPerfData(getLatencyPerfData(podStartupLatency, testInfo), "latency")