Fixed ann remote running command (#303)

Author: filipecosta90

redisbench_admin/run/ann/ann.py

@@ -15,7 +15,7 @@ def prepare_ann_benchmark_command(
     current_workdir: str,
     ann_path: str,
 ):
-    command_arr = ["python3", ann_path]
+    command_arr = ["sudo", "python3", ann_path]
 
     if "arguments" in benchmark_config:
         command_arr.extend(benchmark_config["arguments"].strip().split(" "))

redisbench_admin/run_local/local_db.py

@@ -95,7 +95,7 @@ def local_db_spin(
         if status is False:
             raise Exception("Redis cluster setup failed. Failing test.")
 
-    dataset, _, _ = check_dataset_local_requirements(
+    dataset, dataset_name, _, _ = check_dataset_local_requirements(
         benchmark_config,
         temporary_dir,
         dirname,

redisbench_admin/run_remote/run_remote.py

@@ -4,6 +4,8 @@
 #  All rights reserved.
 #
 import logging
+import random
+import string
 import sys
 import traceback
 import redis
@@ -188,10 +190,12 @@ def run_remote_command_logic(args, project_name, project_version):
     overall_tables = {}
 
     for benchmark_type, bench_by_dataset_map in benchmark_runs_plan.items():
+        logging.info("Running benchmarks of type {}.".format(benchmark_type))
         for (
             dataset_name,
             bench_by_dataset_and_setup_map,
         ) in bench_by_dataset_map.items():
+            logging.info("Running benchmarks for dataset {}.".format(dataset_name))
             for setup_name, setup_details in bench_by_dataset_and_setup_map.items():
 
                 setup_settings = setup_details["setup_settings"]
@@ -235,15 +239,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                 )
                             )
                             if "remote" in benchmark_config:
-                                import string
-                                import random
-
-                                temporary_dir = "/tmp/{}".format(
-                                    "".join(
-                                        random.choice(string.ascii_lowercase)
-                                        for i in range(20)
-                                    )
-                                )
+                                temporary_dir = get_tmp_folder_rnd()
                                 (
                                     client_public_ip,
                                     server_plaintext_port,
@@ -366,7 +362,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                             return_code,
                                             server_plaintext_port,
                                             ssh_tunnel,
-                                        ) = ro_benchmar_reuse(
+                                        ) = ro_benchmark_reuse(
                                             artifact_version,
                                             benchmark_type,
                                             cluster_enabled,
@@ -813,7 +809,14 @@ def run_remote_command_logic(args, project_name, project_version):
     exit(return_code)
 
 
-def ro_benchmar_reuse(
+def get_tmp_folder_rnd():
+    temporary_dir = "/tmp/{}".format(
+        "".join(random.choice(string.ascii_lowercase) for i in range(20))
+    )
+    return temporary_dir
+
+
+def ro_benchmark_reuse(
     artifact_version,
     benchmark_type,
     cluster_enabled,

redisbench_admin/utils/local.py

@@ -23,12 +23,15 @@ def check_dataset_local_requirements(
     is_cluster=False,
 ):
     dataset = None
+    dataset_name = None
     full_path = None
     tmp_path = None
     if dbconfig_keyname in benchmark_config:
         for k in benchmark_config[dbconfig_keyname]:
             if "dataset" in k:
                 dataset = k["dataset"]
+            if "dataset_name" in k:
+                dataset_name = k["dataset_name"]
         if dataset is not None:
             full_path = check_if_needs_remote_fetch(
                 dataset, datasets_localtemp_dir, dirname
@@ -50,7 +53,7 @@ def check_dataset_local_requirements(
                     )
                     copyfile(full_path, tmp_path)
 
-    return dataset, full_path, tmp_path
+    return dataset, dataset_name, full_path, tmp_path
 
 
 def check_if_needs_remote_fetch(

redisbench_admin/utils/remote.py

@@ -169,7 +169,7 @@ def check_dataset_remote_requirements(
     db_ssh_port=22,
 ):
     res = True
-    dataset, fullpath, tmppath = check_dataset_local_requirements(
+    dataset, dataset_name, fullpath, tmppath = check_dataset_local_requirements(
         benchmark_config,
         ".",
         dirname,

tests/test_ann.py

@@ -23,7 +23,7 @@ def test_prepare_ann_benchmark_command():
             ".",
         )
         assert (
-            " ".join(command_arr[2:])
+            " ".join(command_arr[3:])
             == "--algorithm redisearch-hnsw --dataset mnist-784-euclidean --run-group M-4 --count 1 --build-clients 1 --test-clients 0 --host localhost --port 6379 --json-output ./result.json"
         )
 

tests/test_local.py

@@ -4,9 +4,6 @@
 
 import redis
 
-from redisbench_admin.utils.local import (
-    check_dataset_local_requirements,
-)
 from redisbench_admin.environments.oss_standalone import (
     spin_up_local_redis,
     generate_standalone_redis_server_args,