From bfc592732b7ca097135a2f01e8a0f19e8f5d121d Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 13 Apr 2021 12:31:22 -0700 Subject: [PATCH] print out all times in details --- pkg/minikube/perf/result_manager.go | 22 +++++++++++++++++----- pkg/minikube/perf/start.go | 6 +++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/perf/result_manager.go b/pkg/minikube/perf/result_manager.go index 4e5386fc5d..d28ce3e041 100644 --- a/pkg/minikube/perf/result_manager.go +++ b/pkg/minikube/perf/result_manager.go @@ -73,19 +73,17 @@ func (rm *resultManager) summarizeResults(binaries []*Binary) { } table[0][0] = "minikube start" table[1][0] = "enable ingress" + var totalTimes map[string]map[string][]float64 for i, b := range binaries { for t := range rm.results[b].results { - //fmt.Printf("Times for %s %s: ", b.Name(), t) index := 0 if t == "ingress" { index = 1 } - totalTimes := rm.totalTimes(b, t) - table[index][i+1] = fmt.Sprintf("%.1fs", average(totalTimes)) - //fmt.Printf("Average time for %s %s: %.1fs\n\n", b.Name(), t, average(totalTimes)) + totalTimes[t][b.Name()] = rm.totalTimes(b, t) + table[index][i+1] = fmt.Sprintf("%.1fs", average(totalTimes[t][b.Name()])) } } - t := tablewriter.NewWriter(os.Stdout) t.SetHeader([]string{"Command", binaries[0].Name(), binaries[1].Name()}) for _, v := range table { @@ -93,6 +91,20 @@ func (rm *resultManager) summarizeResults(binaries []*Binary) { } t.Render() + fmt.Println("
") + fmt.Println() + for timing, times := range totalTimes { + for b, t := range times { + fmt.Printf("Times for %s %s: ", b, timing) + for _, tt := range t { + fmt.Printf("%.1fs ", tt) + } + fmt.Println() + } + } + fmt.Println() + fmt.Println("
") + // print out summary per log //rm.summarizeTimesPerLog(binaries) } diff --git a/pkg/minikube/perf/start.go b/pkg/minikube/perf/start.go index 50d60a5e4a..a82267d092 100644 --- a/pkg/minikube/perf/start.go +++ b/pkg/minikube/perf/start.go @@ -66,7 +66,7 @@ func collectResults(ctx context.Context, binaries []*Binary, driver string) (*re return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name()) } rm.addResult(binary, "start", *r) - if runtime.GOOS != "darwin" { + if !skipIngress(driver) { r, err = timeEnableIngress(ctx, binary) if err != nil { return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name()) @@ -128,3 +128,7 @@ func timeEnableIngress(ctx context.Context, binary *Binary) (*result, error) { } return r, nil } + +func skipIngress(driver string) bool { + return runtime.GOOS == "darwin" && driver == "docker" +}