Updated dependencies to match ann-benchmark deps (#299)

* Bumping version from 0.6.27 to 0.7.0

* Updated dependencies to match ann-benchmark deps

* Bumping version from 0.7.0 to 0.7.1

* Bumping version from 0.7.0 to 0.7.1

Author: filipecosta90

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.7.0"
+version = "0.7.1"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"
@@ -23,18 +23,26 @@ jsonpath_ng = "^1.5.2"
 pysftp = "^0.2.9"
 python_terraform = "^0.10.1"
 GitPython = "^3.1.12"
-PyYAML = "^5.4.0"
+PyYAML = "^5.4"
 wget = "^3.2"
 pytablewriter = {extras = ["html"], version = "^0.64.1"}
 sshtunnel = "^0.4.0"
 pyWorkFlow = "^0.0.2"
 Flask = "^2.0.1"
 flask-restx = "^0.5.1"
 Flask-HTTPAuth = "^4.4.0"
-docker = "^5.0.0"
+docker = "^5.0.2"
 tox-docker = "^3.1.0"
 daemonize = "^2.5.0"
 pandas = "^1.0"
+ansicolors = "^1.1.8"
+h5py = "^2.10.0"
+matplotlib = "^3.1.2"
+numpy = "^1.17.4"
+psutil = "^5.6.6"
+scipy = "^1.3.3"
+scikit-learn = "^0.22.2"
+Jinja2 = "^3.0.3"
 
 [tool.poetry.dev-dependencies]
 pytest = "^4.6"

pyproject.toml

@@ -1,5 +1,6 @@
 import pkg_resources
 
+
 ANN_MULTIRUN_PATH = pkg_resources.resource_filename(
     "redisbench_admin", "run/ann/pkg/multirun.py"
 )
@@ -12,8 +13,9 @@ def prepare_ann_benchmark_command(
     benchmark_config: object,
     results_file: str,
     current_workdir: str,
+    ann_path: str,
 ):
-    command_arr = ["python3", ANN_MULTIRUN_PATH]
+    command_arr = ["python3", ann_path]
 
     if "arguments" in benchmark_config:
         command_arr.extend(benchmark_config["arguments"].strip().split(" "))
@@ -29,7 +31,10 @@ def prepare_ann_benchmark_command(
     if cluster_mode:
         command_arr.append("--cluster")
 
-    command_arr.extend(["--json-output", "{}/{}".format(current_workdir, results_file)])
+    json_output = results_file
+    if current_workdir is not None and not (results_file.startswith("/")):
+        json_output = "{}/{}".format(current_workdir, results_file)
+    command_arr.extend(["--json-output", json_output])
 
     command_str = " ".join([str(x) for x in command_arr])
     return command_arr, command_str

redisbench_admin/run/ann/ann.py

@@ -15,7 +15,10 @@
 from redisbench_admin.run.aibench_run_inference_redisai_vision.aibench_run_inference_redisai_vision import (
     prepare_aibench_benchmark_command,
 )
-from redisbench_admin.run.ann.ann import prepare_ann_benchmark_command
+from redisbench_admin.run.ann.ann import (
+    prepare_ann_benchmark_command,
+    ANN_MULTIRUN_PATH,
+)
 from redisbench_admin.run.ftsb.ftsb import prepare_ftsb_benchmark_command
 from redisbench_admin.run.memtier_benchmark.memtier_benchmark import (
     prepare_memtier_benchmark_command,
@@ -40,6 +43,9 @@
     parse_exporter_timemetric_definition,
     check_required_modules,
 )
+from redisbench_admin.utils.redisgraph_benchmark_go import (
+    get_redisbench_admin_remote_path,
+)
 from redisbench_admin.utils.remote import (
     extract_perversion_timeseries_from_results,
     extract_perbranch_timeseries_from_results,
@@ -58,6 +64,10 @@ def prepare_benchmark_parameters(
     current_workdir=None,
     cluster_api_enabled=False,
     config_key="clientconfig",
+    client_public_ip=None,
+    username=None,
+    private_key=None,
+    client_ssh_port=None,
 ):
     command_arr = None
     command_str = None
@@ -76,6 +86,10 @@ def prepare_benchmark_parameters(
                     remote_results_file,
                     server_plaintext_port,
                     server_private_ip,
+                    client_public_ip,
+                    username,
+                    private_key,
+                    client_ssh_port,
                 )
     # v0.4 spec
     elif type(benchmark_config[config_key]) == dict:
@@ -91,6 +105,10 @@ def prepare_benchmark_parameters(
             remote_results_file,
             server_plaintext_port,
             server_private_ip,
+            client_public_ip,
+            username,
+            private_key,
+            client_ssh_port,
         )
     printed_command_str = command_str
     printed_command_arr = command_arr
@@ -116,6 +134,10 @@ def prepare_benchmark_parameters_specif_tooling(
     remote_results_file,
     server_plaintext_port,
     server_private_ip,
+    client_public_ip,
+    username,
+    private_key,
+    client_ssh_port,
 ):
     if "redis-benchmark" in benchmark_tool:
         command_arr, command_str = prepare_redis_benchmark_command(
@@ -178,13 +200,22 @@ def prepare_benchmark_parameters_specif_tooling(
             remote_results_file,
         )
     if "ann" in benchmark_tool:
+        ann_path = ANN_MULTIRUN_PATH
+        if isremote is True:
+            [recv_exit_status, stdout, stderr] = get_redisbench_admin_remote_path(
+                client_public_ip, username, private_key, client_ssh_port
+            )[0]
+            ann_path = stdout[0].strip() + "/run/ann/pkg/multirun.py"
+            logging.info("Remote ann-benchmark path: {}".format(ann_path))
+
         (command_arr, command_str,) = prepare_ann_benchmark_command(
             server_private_ip,
             server_plaintext_port,
             cluster_api_enabled,
             entry,
             remote_results_file,
             current_workdir,
+            ann_path,
         )
     if "ftsb_" in benchmark_tool:
         input_data_file = None

redisbench_admin/run/common.py

@@ -16,6 +16,7 @@
     post_process_remote_run,
 )
 from redisbench_admin.utils.benchmark_config import extract_benchmark_tool_settings
+from redisbench_admin.utils.redisgraph_benchmark_go import setup_remote_benchmark_ann
 from redisbench_admin.utils.remote import (
     execute_remote_commands,
     fetch_file_from_remote_setup,
@@ -72,6 +73,14 @@ def run_remote_client_tool(
         client_ssh_port,
         private_key,
     )
+    if "ann-benchmarks" in benchmark_tool:
+        logging.info(
+            "Ensuring that the ann-benchmark being used is the latest version release within the redisbench-admin package"
+        )
+        setup_remote_benchmark_ann(
+            client_public_ip, username, private_key, client_ssh_port
+        )
+
     command, command_str = prepare_benchmark_parameters(
         benchmark_config,
         benchmark_tool,
@@ -82,6 +91,10 @@ def run_remote_client_tool(
         None,
         cluster_api_enabled,
         config_key,
+        client_public_ip,
+        username,
+        private_key,
+        client_ssh_port,
     )
     tmp = None
     if benchmark_tool == "redis-benchmark":

redisbench_admin/run_remote/remote_client.py

@@ -105,6 +105,7 @@ def run_remote_command_logic(args, project_name, project_version):
     private_key = args.private_key
     grafana_profile_dashboard = args.grafana_profile_dashboard
     profilers_enabled = args.enable_profilers
+    keep_env_and_topo = args.keep_env_and_topo
 
     if args.skip_env_vars_verify is False:
         check_ec2_env()
@@ -606,7 +607,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                                 )
 
                                         if setup_details["env"] is None:
-                                            if args.keep_env_and_topo is False:
+                                            if keep_env_and_topo is False:
                                                 shutdown_remote_redis(
                                                     redis_conns, ssh_tunnel
                                                 )
@@ -728,7 +729,9 @@ def run_remote_command_logic(args, project_name, project_version):
                                         "Detected Keyboard interruput...Destroy all remote envs and exiting right away!"
                                     )
                                     if args.inventory is None:
-                                        terraform_destroy(remote_envs)
+                                        terraform_destroy(
+                                            remote_envs, keep_env_and_topo
+                                        )
                                     exit(1)
                                 except:
                                     (
@@ -771,7 +774,7 @@ def run_remote_command_logic(args, project_name, project_version):
         )
         writer.write_table()
     if args.inventory is None:
-        terraform_destroy(remote_envs)
+        terraform_destroy(remote_envs, keep_env_and_topo)
 
     if args.push_results_redistimeseries:
         for setup_name, setup_target_table in overall_tables.items():

redisbench_admin/run_remote/run_remote.py

@@ -86,17 +86,20 @@ def terraform_spin_or_reuse_env(
     )
 
 
-def terraform_destroy(remote_envs):
-    for remote_setup_name, tf in remote_envs.items():
-        # tear-down
-        logging.info("Tearing down setup {}".format(remote_setup_name))
-        tf.destroy(
-            capture_output="yes",
-            no_color=IsNotFlagged,
-            force=IsNotFlagged,
-            auto_approve=True,
-        )
+def terraform_destroy(remote_envs, keep_env=False):
+    if keep_env is False:
+        for remote_setup_name, tf in remote_envs.items():
+            # tear-down
+            logging.info("Tearing down setup {}".format(remote_setup_name))
+            tf.destroy(
+                capture_output="yes",
+                no_color=IsNotFlagged,
+                force=IsNotFlagged,
+                auto_approve=True,
+            )
         logging.info("Tear-down completed")
+    else:
+        logging.info("Keeping the environment UP uppon request")
 
 
 def retrieve_inventory_info(inventory_str):

redisbench_admin/run_remote/terraform.py

@@ -9,6 +9,33 @@
 )
 
 
+def get_redisbench_admin_remote_path(
+    client_public_ip, username, private_key, client_ssh_port
+):
+    commands = [
+        "python3 -c 'import os; import redisbench_admin; print(os.path.dirname(redisbench_admin.__file__))'"
+    ]
+    # last argument (get_pty) needs to be set to true
+    # check: https://stackoverflow.com/questions/5785353/paramiko-and-sudo
+    return execute_remote_commands(
+        client_public_ip, username, private_key, commands, client_ssh_port, True
+    )
+
+
+def setup_remote_benchmark_ann(
+    client_public_ip, username, private_key, client_ssh_port
+):
+    commands = [
+        "sudo apt install python3-pip -y",
+        "sudo pip3 install redisbench-admin>=0.7.0",
+    ]
+    # last argument (get_pty) needs to be set to true
+    # check: https://stackoverflow.com/questions/5785353/paramiko-and-sudo
+    execute_remote_commands(
+        client_public_ip, username, private_key, commands, client_ssh_port, True
+    )
+
+
 def setup_remote_benchmark_agent(
     client_public_ip, username, private_key, client_ssh_port
 ):

redisbench_admin/utils/redisgraph_benchmark_go.py

@@ -24,7 +24,7 @@ def test_prepare_ann_benchmark_command():
         )
         assert (
             " ".join(command_arr[2:])
-            == '--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'
+            == "--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"
         )