From 7fc488ff4bb02a560f177c5f5fdccb1d08523e53 Mon Sep 17 00:00:00 2001 From: Bojan Serafimov Date: Thu, 14 Apr 2022 00:51:10 -0400 Subject: [PATCH] Move parsing to zenbenchmark --- test_runner/fixtures/benchmark_fixture.py | 10 ++++++++++ test_runner/performance/test_pageserver.py | 8 +------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test_runner/fixtures/benchmark_fixture.py b/test_runner/fixtures/benchmark_fixture.py index 480eb3f891..11d37eb8f9 100644 --- a/test_runner/fixtures/benchmark_fixture.py +++ b/test_runner/fixtures/benchmark_fixture.py @@ -245,6 +245,16 @@ class ZenithBenchmarker: '', MetricReport.TEST_PARAM) + def record_psbench_result(self, psbench_output): + """Record results from pageserver benchmarker.""" + for line in psbench_output.split("\n"): + tokens = line.split(" ") + report = tokens[0] + name = tokens[1] + value = tokens[2] + unit = tokens[3] if len(tokens) > 3 else "" + self.record(name, value, unit, report=report) + def get_io_writes(self, pageserver) -> int: """ Fetch the "cumulative # of bytes written" metric from the pageserver diff --git a/test_runner/performance/test_pageserver.py b/test_runner/performance/test_pageserver.py index 8b578b9599..bf0018a106 100644 --- a/test_runner/performance/test_pageserver.py +++ b/test_runner/performance/test_pageserver.py @@ -42,10 +42,4 @@ def test_get_page(zenith_env_builder: ZenithEnvBuilder, pscur.execute(f"checkpoint {env.initial_tenant.hex} {timeline} 0") output = psbench_bin.run(env.initial_tenant.hex, timeline) - for line in output.split("\n"): - tokens = line.split(" ") - report = tokens[0] - name = tokens[1] - value = tokens[2] - unit = tokens[3] if len(tokens) > 3 else "" - zenbenchmark.record(name, value, unit, report=report) + zenbenchmark.record_psbench_result(output)