Fixed remote results fetching from benchmark client (#369)

* Fixed execute_init_commands bug on L446

* Fixed remote results fetching from benchmark client

* Extra logging on results fetching

* Fixed is_ycsb_java check

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.9.12"
+version = "0.9.15"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"
@@ -36,7 +36,7 @@ daemonize = "^2.5.0"
 pandas = "^1.0"
 ansicolors = "^1.1.8"
 matplotlib = "^3.1.2"
-numpy = "^1.17.4"
+numpy = "^1.23.1"
 psutil = "^5.6.6"
 scipy = "^1.3.3"
 Jinja2 = "^3.0.3"

redisbench_admin/cli.py

@@ -29,8 +29,6 @@
 from redisbench_admin.watchdog.args import create_watchdog_arguments
 from redisbench_admin.watchdog.watchdog import watchdog_command_logic
 
-numpy.random.BitGenerator = numpy.random.bit_generator.BitGenerator
-
 LOG_LEVEL = logging.DEBUG
 if os.getenv("VERBOSE", "0") == "0":
     LOG_LEVEL = logging.INFO

redisbench_admin/run_remote/remote_client.py

@@ -352,7 +352,7 @@ def run_remote_benchmark(
 
         logging.info("Extracting the benchmark results")
         remote_run_result = True
-        if "ycsb" not in commands[0] or "go-ycsb" in commands[0]:
+        if is_ycsb_java(commands) is False:
             if type(local_results_files) == str:
                 local_results_file = local_results_files
                 remote_results_file = remote_results_files
@@ -374,9 +374,25 @@ def run_remote_benchmark(
                         local_results_file,
                         remote_results_file,
                     )
+        else:
+            logging.info(
+                "Given the bellow commands list:\n\t{}\nwe've skipped result fetching".format(
+                    commands
+                )
+            )
     return remote_run_result, stdout, stderr
 
 
+def is_ycsb_java(commands):
+    res = False
+    if len(commands) > 0:
+        tool = commands[0].split(" ")[0]
+        if "ycsb" in tool:
+            if "go-ycsb" not in tool:
+                res = True
+    return res
+
+
 def print_commands_outputs(commands, print_err, res):
     bench_stdout = ""
     bench_stderr = ""

tests/test_remote_client.py

@@ -6,7 +6,10 @@
 import yaml
 
 from redisbench_admin.run.common import prepare_benchmark_parameters
-from redisbench_admin.run_remote.remote_client import ann_benchmark_remote_cmds
+from redisbench_admin.run_remote.remote_client import (
+    ann_benchmark_remote_cmds,
+    is_ycsb_java,
+)
 from redisbench_admin.utils.benchmark_config import extract_benchmark_tool_settings
 
 
@@ -68,3 +71,18 @@ def test_ann_benchmark_remote_cmds():
             pkg_path
         )
     )
+
+
+def test_is_ycsb_java():
+    commands = [
+        "memtier_benchmark -s 10.3.0.117 -p 6379 --hide-histogram --json-out-file /tmp/benchmark-result-search-wildcard-nosorting_2022-07-25-14-01-44.out --test-time 120 -c 32 -t 1 --hide-histogram --command 'FT.SEARCH ycsb * LIMIT 0 0'"
+    ]
+    assert is_ycsb_java(commands) == False
+    commands = [
+        "/tmp/go-ycsb -s 10.3.0.117 -p 6379 --hide-histogram --json-out-file /tmp/benchmark-result-search-wildcard-nosorting_2022-07-25-14-01-44.out --test-time 120 -c 32 -t 1 --hide-histogram --command 'FT.SEARCH ycsb * LIMIT 0 0'"
+    ]
+    assert is_ycsb_java(commands) == False
+    commands = [
+        "/tmp/abacac/java/etc/adad/a/a/ycsb -s 10.3.0.117 -p 6379 --hide-histogram --json-out-file /tmp/benchmark-result-search-wildcard-nosorting_2022-07-25-14-01-44.out --test-time 120 -c 32 -t 1 --hide-histogram --command 'FT.SEARCH ycsb * LIMIT 0 0'"
+    ]
+    assert is_ycsb_java(commands) == True