Add loading vector-db-benchmark results into vdb_results variable

Author: mpozniak95

redis_benchmarks_specification/__runner__/runner.py

@@ -209,8 +209,8 @@ def prepare_vector_db_benchmark_parameters(
     port,
     server,
     password,
+    client_mnt_point
 ):
-    logging.info(f"Marcin debug prepare_vdb: {full_benchmark_path}")
     benchmark_command = []
     # if port is not None:
     #     benchmark_command.extend(["REDIS_PORT={}".format(port)])
@@ -221,9 +221,10 @@ def prepare_vector_db_benchmark_parameters(
         "--host",
         f"{server}",
     ])
-    benchmark_command.extend(["--engines", clientconfig.get("engines", "redis-hnsw-m-16-ef-128")])
+    benchmark_command.extend(["--engines", clientconfig.get("engines", "redis-test")])
     benchmark_command.extend(["--datasets", clientconfig.get("datasets", "glove-100-angular")])
     benchmark_command_str = " ".join(benchmark_command)
+    benchmark_command_str = f"bash -c 'ITERATIONS=1 {benchmark_command_str} && mv /code/results {client_mnt_point}.'"
     return None, benchmark_command_str
 
 def prepare_memtier_benchmark_parameters(

redis_benchmarks_specification/__self_contained_coordinator__/post_processing.py

@@ -0,0 +1,18 @@
+import os
+import json
+
+def post_process_vector_db(temporary_dir):
+    results_dir = os.path.join(temporary_dir, 'results')
+    results = {}
+    for file in os.listdir(results_dir):
+        if "upload" in file:
+            with open(os.path.join(results_dir, file), 'r') as f:
+                upload_results = json.load(f)
+                results['upload_time'] = upload_results['results']['upload_time']
+        else:
+            with open(os.path.join(results_dir, file), 'r') as f:
+                query_results = json.load(f)
+                results['rps'] = query_results['results']['rps']
+                results['precision'] = query_results['results']['mean_precisions']
+                results['total_time'] = query_results['results']['total_time']
+    return results

redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py

@@ -15,6 +15,7 @@
 import time
 
 from docker.models.containers import Container
+from redis_benchmarks_specification.__self_contained_coordinator__.post_processing import post_process_vector_db
 from redisbench_admin.profilers.profilers_local import (
     check_compatible_system_and_kernel_and_prepare_profile,
 )
@@ -823,6 +824,7 @@ def process_self_contained_coordinator_stream(
                                         )
                                     )
                                 if restore_build_artifacts:
+                                    print(f"Marcin debug1: Restoring build artifacts")
                                     restore_build_artifacts_from_test_details(
                                         build_artifacts,
                                         github_event_conn,
@@ -968,6 +970,7 @@ def process_self_contained_coordinator_stream(
                                         redis_proc_start_port,
                                         "localhost",
                                         None,
+                                        client_mnt_point,
                                     )
                                 else:
                                     (
@@ -1155,6 +1158,10 @@ def process_self_contained_coordinator_stream(
                                     and git_timestamp_ms is not None
                                 ):
                                     datapoint_time_ms = git_timestamp_ms
+                                if "vector_db_benchmark" in benchmark_tool:
+                                    print(f"Debug: Post-processing vector-db-benchmark results")
+                                    vdb_results = post_process_vector_db(temporary_dir_client)
+                                    print(f"Debug: results: {vdb_results}")
                                 post_process_benchmark_results(
                                     benchmark_tool,
                                     local_benchmark_output_filename,

redis_benchmarks_specification/setups/builders/gcc:11.5.0-amd64-debian-bullseye-redisearch.yml renamed to redis_benchmarks_specification/setups/builders/gcc:10.5.0-amd64-debian-bullseye-redisearch.yml

@@ -1,21 +1,21 @@
 version: 0.1
-id: gcc:11.5.0-amd64-debian-bullseye-redisearch
+id: gcc:10.5.0-amd64-debian-bullseye-redisearch
 os: debian-bullseye
 arch: amd64
 compiler: "gcc"
 cpp_compiler: "g++"
 kind: docker
-build_image: gcc:11.5.0-bullseye 
+build_image: gcc:10.5.0-bullseye 
 run_image: debian:bullseye
 description: "Using GNU Compiler Containers (https://hub.docker.com/_/gcc?tab=description)
               pre-configured environment with all the tools required to build with gcc."
 build_artifacts:
   - redisearch.so
   - redis-server
-build_command: "sh -c 'BUILD_WITH_MODULES=yes make --ignore-errors -j && cd modules/redisearch/src && make setup && make build && cd -'"
+build_command: "sh -c 'apt update && apt install python3-pip -y && BUILD_WITH_MODULES=yes make --ignore-errors -j && cd modules/redisearch/src && make setup && make build && cd -'"
 metadata:
   compiler: "gcc"
-  compiler_version: "11.5.0"
+  compiler_version: "10.5.0"
   os: debian-bullseye
   arch: amd64
 

redis_benchmarks_specification/setups/topologies/topologies.yml

@@ -15,7 +15,7 @@ spec:
     redis_topology:
       primaries: 1
       replicas: 0
-    redis_arguments: --loadmodule /mnt/redis/modules/redisearch/src/bin/linux-x64-release/search-community/redisearch.so
+    redis_arguments: --loadmodule /mnt/redis/redisearch.so
     resources:
       requests:
         cpus: "1"

redis_benchmarks_specification/test-suites/vector_db_benchmark_test.yml

@@ -16,7 +16,7 @@ tested-commands:
 redis-topologies:
 - oss-standalone-with-redisearch
 build-variants:
-- gcc:11.5.0-amd64-debian-bullseye-redisearch
+- gcc:10.5.0-amd64-debian-bullseye-redisearch
 - dockerhub
 clientconfig:
   run_image: vector-db-benchmark:test