diff --git a/test/e2e/density.go b/test/e2e/density.go index e17b913d5dd..ebfbb221d8a 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -135,8 +135,6 @@ var _ = Describe("Density [Skipped]", func() { c.Pods(ns).Delete(name, nil) } - expectNoError(writePerfData(c, fmt.Sprintf(testContext.OutputDir+"/%s", uuid), "after")) - // Verify latency metrics. highLatencyRequests, err := HighLatencyRequests(c) expectNoError(err) @@ -172,7 +170,6 @@ var _ = Describe("Density [Skipped]", func() { expectNoError(resetMetrics(c)) expectNoError(os.Mkdir(fmt.Sprintf(testContext.OutputDir+"/%s", uuid), 0777)) - expectNoError(writePerfData(c, fmt.Sprintf(testContext.OutputDir+"/%s", uuid), "before")) Logf("Listing nodes for easy debugging:\n") for _, node := range nodes.Items { diff --git a/test/e2e/latency.go b/test/e2e/latency.go index f1526654e32..c7c0cc83538 100644 --- a/test/e2e/latency.go +++ b/test/e2e/latency.go @@ -53,8 +53,6 @@ var _ = Describe("Latency [Skipped]", func() { c.Pods(ns).Delete(name, nil) } - expectNoError(writePerfData(c, fmt.Sprintf(testContext.OutputDir+"/%s", uuid), "after")) - // Verify latency metrics highLatencyRequests, err := HighLatencyRequests(c) expectNoError(err) @@ -81,7 +79,6 @@ var _ = Describe("Latency [Skipped]", func() { expectNoError(resetMetrics(c)) expectNoError(os.Mkdir(fmt.Sprintf(testContext.OutputDir+"/%s", uuid), 0777)) - expectNoError(writePerfData(c, fmt.Sprintf(testContext.OutputDir+"/%s", uuid), "before")) Logf("Listing nodes for easy debugging:\n") for _, node := range nodes.Items { diff --git a/test/e2e/metrics_util.go b/test/e2e/metrics_util.go index 6eaf5cb56d5..d7385701640 100644 --- a/test/e2e/metrics_util.go +++ b/test/e2e/metrics_util.go @@ -21,9 +21,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" - "net/http" - "os" "sort" "strconv" "strings" @@ -345,72 +342,6 @@ func prettyPrintJSON(metrics interface{}) string { return string(formatted.Bytes()) } -// Retrieves debug information. -func getDebugInfo(c *client.Client) (map[string]string, error) { - data := make(map[string]string) - for _, key := range []string{"block", "goroutine", "heap", "threadcreate"} { - resp, err := http.Get(c.Get().AbsPath(fmt.Sprintf("debug/pprof/%s", key)).URL().String() + "?debug=2") - if err != nil { - Logf("Warning: Error trying to fetch %s debug data: %v", key, err) - continue - } - body, err := ioutil.ReadAll(resp.Body) - resp.Body.Close() - if err != nil { - Logf("Warning: Error trying to read %s debug data: %v", key, err) - } - data[key] = string(body) - } - return data, nil -} - -func writePerfData(c *client.Client, dirName string, postfix string) error { - fname := fmt.Sprintf("%s/metrics_%s.txt", dirName, postfix) - - handler, err := os.Create(fname) - if err != nil { - return fmt.Errorf("Error creating file '%s': %v", fname, err) - } - - metrics, err := getMetrics(c) - if err != nil { - return fmt.Errorf("Error retrieving metrics: %v", err) - } - - _, err = handler.WriteString(metrics) - if err != nil { - return fmt.Errorf("Error writing metrics: %v", err) - } - - err = handler.Close() - if err != nil { - return fmt.Errorf("Error closing '%s': %v", fname, err) - } - - debug, err := getDebugInfo(c) - if err != nil { - return fmt.Errorf("Error retrieving debug information: %v", err) - } - - for key, value := range debug { - fname := fmt.Sprintf("%s/%s_%s.txt", dirName, key, postfix) - handler, err = os.Create(fname) - if err != nil { - return fmt.Errorf("Error creating file '%s': %v", fname, err) - } - _, err = handler.WriteString(value) - if err != nil { - return fmt.Errorf("Error writing %s: %v", key, err) - } - - err = handler.Close() - if err != nil { - return fmt.Errorf("Error closing '%s': %v", fname, err) - } - } - return nil -} - // extractMetricSamples parses the prometheus metric samples from the input string. func extractMetricSamples(metricsBlob string) ([]*model.Sample, error) { dec, err := expfmt.NewDecoder(strings.NewReader(metricsBlob), expfmt.FmtText)