Fixed redis-benchmark remote deployments version check (#55)

* [fix] Fixed redis-benchmark remote deployments version check

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.1.51"
+version = "0.1.52"
 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]>"]
 readme = "README.md"

redisbench_admin/run/redis_benchmark/redis_benchmark.py

@@ -71,7 +71,7 @@ def prepareRedisBenchmarkCommand(
 def ensure_redis_benchmark_version_from_input(benchmark_min_tool_version, benchmark_min_tool_version_major,
                                               benchmark_min_tool_version_minor, benchmark_min_tool_version_patch,
                                               benchmark_tool, stdout):
-    version_output = stdout.decode('ascii').split("\n")[0]
+    version_output = stdout.split("\n")[0]
     logging.info(
         "Detected benchmark config tool {} with version {}".format(benchmark_tool, version_output))
     p = re.compile("redis-benchmark (\d+)\.(\d+)\.(\d+) ")
@@ -100,16 +100,15 @@ def redis_benchmark_ensure_min_version_local(benchmark_tool, benchmark_min_tool_
     (stdout, sterr) = benchmark_client_process.communicate()
     ensure_redis_benchmark_version_from_input(benchmark_min_tool_version, benchmark_min_tool_version_major,
                                               benchmark_min_tool_version_minor, benchmark_min_tool_version_patch,
-                                              benchmark_tool, stdout)
+                                              benchmark_tool, stdout.decode('ascii'))
 
 
 def redis_benchmark_ensure_min_version_remote(benchmark_tool, benchmark_min_tool_version,
                                               benchmark_min_tool_version_major,
-                                              benchmark_min_tool_version_minor, benchmark_min_tool_version_patch):
-    benchmark_client_process = subprocess.Popen(args=[benchmark_tool, "--version"],
-                                                stdout=subprocess.PIPE,
-                                                stderr=subprocess.STDOUT)
-    (stdout, sterr) = benchmark_client_process.communicate()
+                                              benchmark_min_tool_version_minor, benchmark_min_tool_version_patch,
+                                              client_public_ip, username, private_key):
+    res = executeRemoteCommands(client_public_ip, username, private_key, ["{} --version".format(benchmark_tool)])
+    recv_exit_status, stdout, stderr = res[0]
     ensure_redis_benchmark_version_from_input(benchmark_min_tool_version, benchmark_min_tool_version_major,
                                               benchmark_min_tool_version_minor, benchmark_min_tool_version_patch,
-                                              benchmark_tool, stdout)
+                                              benchmark_tool, stdout[0])

redisbench_admin/run_remote/run_remote.py

@@ -11,7 +11,7 @@
 from redistimeseries.client import Client
 
 from redisbench_admin.run.redis_benchmark.redis_benchmark import redis_benchmark_ensure_min_version_local, \
-    redis_benchmark_from_stdout_csv_to_json
+    redis_benchmark_from_stdout_csv_to_json, redis_benchmark_ensure_min_version_remote
 from redisbench_admin.run.common import extract_benchmark_tool_settings, prepare_benchmark_parameters, \
     runRemoteBenchmark
 from redisbench_admin.utils.benchmark_config import (
@@ -271,10 +271,11 @@ def run_remote_command_logic(args):
                         )
 
                     if benchmark_min_tool_version is not None and benchmark_tool == "redis-benchmark":
-                        redis_benchmark_ensure_min_version_local(benchmark_tool, benchmark_min_tool_version,
-                                                                 benchmark_min_tool_version_major,
-                                                                 benchmark_min_tool_version_minor,
-                                                                 benchmark_min_tool_version_patch)
+                        redis_benchmark_ensure_min_version_remote(benchmark_tool, benchmark_min_tool_version,
+                                                                  benchmark_min_tool_version_major,
+                                                                  benchmark_min_tool_version_minor,
+                                                                  benchmark_min_tool_version_patch,
+                                                                  client_public_ip, username, private_key)
 
                     command, command_str = prepare_benchmark_parameters(benchmark_config, benchmark_tool,
                                                                         server_plaintext_port,