From 7794306cc0bc295d343a55a516b99a1a8ba2805f Mon Sep 17 00:00:00 2001 From: "Gergely Daroczi (@daroczig)" Date: Thu, 26 Sep 2024 10:06:10 +0200 Subject: [PATCH] backfill old benchmark id with new runs --- src/sc_crawler/inspector.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/sc_crawler/inspector.py b/src/sc_crawler/inspector.py index 531f0d3..bdf5436 100644 --- a/src/sc_crawler/inspector.py +++ b/src/sc_crawler/inspector.py @@ -287,6 +287,7 @@ def inspect_server_benchmarks(server: "Server") -> List[dict]: _log_cannot_load_benchmarks(server, framework, e, True) framework = "stress_ng" + # TODO deprecate try: cores_per_path = {"stressng": server.vcpus, "stressngsinglecore": 1} for cores_path in cores_per_path.keys(): @@ -310,7 +311,35 @@ def inspect_server_benchmarks(server: "Server") -> List[dict]: } ) except Exception as e: - _log_cannot_load_benchmarks(server, framework, e, True) + # backfill with newer method - can be dropped once we deprecate stress_ng:cpu_all + try: + records = [] + with open( + _server_framework_stdout_path(server, "stressngfull"), newline="" + ) as f: + rows = csv.reader(f, quoting=csv.QUOTE_NONNUMERIC) + for row in rows: + records.append(row) + for i in [0, len(records) - 1]: + stressng_version = _server_framework_meta(server, "stressngfull")[ + "version" + ] + benchmarks.append( + { + **_benchmark_metafields( + server, + framework="stressngfull", + benchmark_id=":".join([framework, "cpu_all"]), + ), + "config": { + "cores": records[i][0], + "framework_version": stressng_version, + }, + "score": records[i][1], + } + ) + except Exception as e: + _log_cannot_load_benchmarks(server, framework, e, True) workload = "div16" try: