redisbench-admin 0.11.27__py3-none-any.whl → 0.11.29__py3-none-any.whl

redisbench_admin/run/ftsb/ftsb.py

@@ -55,12 +55,16 @@ def prepare_ftsb_benchmark_command(
 
 
 def extract_ftsb_extra_links(
-    benchmark_config, benchmark_tool, config_key="clientconfig"
+    benchmark_config, benchmark_tool, config_key="clientconfig", architecture="x86_64"
 ):
     remote_tool_link = "/tmp/{}".format(benchmark_tool)
+    arch_txt = "amd64"
+    if architecture == "aarch64":
+        arch_txt = "arm64"
+
     tool_link = (
         "https://s3.amazonaws.com/benchmarks.redislabs/"
-        + "redisearch/tools/ftsb/{}_linux_amd64".format(benchmark_tool)
+        + f"redisearch/tools/ftsb/{benchmark_tool}_linux_{arch_txt}"
     )
     queries_file_link = None
     for entry in benchmark_config[config_key]:

redisbench_admin/run/run.py

@@ -124,7 +124,7 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
                     logging.info(f"FINAL DB CONFIG: {final_db_config}")
                     test_benchmark_config["dbconfig"] = final_db_config
 
-                logging.info(
+                logging.debug(
                     f"final benchmark config for setup: {setup_name} and test: {test_name}. {test_benchmark_config}"
                 )
                 # add benchmark

redisbench_admin/run_remote/remote_client.py

@@ -53,6 +53,7 @@ def run_remote_client_tool(
     redis_conns=[],
     do_post_process=True,
     redis_password=None,
+    architecture="x86_64",
 ):
     (
         benchmark_min_tool_version,
@@ -83,6 +84,7 @@ def run_remote_client_tool(
         arch_str,
         client_ssh_port,
         private_key,
+        architecture,
     )
     if "ann-benchmarks" in benchmark_tool:
         logging.info(

redisbench_admin/run_remote/remote_db.py

@@ -104,6 +104,7 @@ def remote_db_spin(
     ignore_keyspace_errors=False,
     continue_on_module_check_error=False,
     keyspace_check_timeout=60,
+    architecture="x86_64",
 ):
     (
         _,
@@ -135,6 +136,7 @@ def remote_db_spin(
             username,
             continue_on_module_check_error,
         )
+        logging.info(f"final remote module files {remote_module_files}...")
     # setup Redis
     redis_setup_result = True
     redis_conns = []
@@ -337,6 +339,7 @@ def remote_db_spin(
             [],
             False,
             redis_password,
+            architecture,
         )
         logging.info(
             "Finished loading the data via client tool. Took {} seconds. Result={}".format(

redisbench_admin/run_remote/remote_helpers.py

@@ -66,8 +66,11 @@ def remote_tool_pre_bench_step(
     arch_str,
     client_ssh_port,
     private_key,
+    architecture="x86_64",
 ):
-    logging.info("Settting up remote tool {} requirements".format(benchmark_tool))
+    logging.info(
+        f"Settting up remote tool {benchmark_tool} requirements. architecture ={architecture}"
+    )
     if benchmark_tool == "redisgraph-benchmark-go":
         setup_remote_benchmark_tool_redisgraph_benchmark_go(
             client_public_ip,
@@ -90,7 +93,9 @@ def remote_tool_pre_bench_step(
             queries_file_link,
             remote_tool_link,
             tool_link,
-        ) = extract_ftsb_extra_links(benchmark_config, benchmark_tool, config_key)
+        ) = extract_ftsb_extra_links(
+            benchmark_config, benchmark_tool, config_key, architecture
+        )
         logging.info(
             "FTSB Extracted:\nremote tool input: {}\nremote tool link: {}\ntool path: {}".format(
                 queries_file_link, remote_tool_link, tool_link

redisbench_admin/run_remote/run_remote.py

@@ -553,6 +553,8 @@ def run_remote_command_logic(args, project_name, project_version):
                                             flushall_on_every_test_start,
                                             ignore_keyspace_errors,
                                             continue_on_module_check_error,
+                                            60,
+                                            architecture,
                                         )
                                         if benchmark_type == "read-only":
                                             ro_benchmark_set(
@@ -698,6 +700,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                         redis_conns,
                                         True,
                                         redis_password,
+                                        architecture,
                                     )
 
                                     if profilers_enabled:

redisbench_admin/run_remote/standalone.py

@@ -75,7 +75,9 @@ def remote_module_files_cp(
     continue_on_module_check_error=False,
 ):
     remote_module_files = []
+
     if local_module_files is not None:
+        logging.info(f"there is a total of  {len(local_module_files)} modules")
         for local_module_file in local_module_files:
             splitted_module_and_plugins = []
             if type(local_module_file) is str:
@@ -135,7 +137,7 @@ def remote_module_files_cp(
                 if pos > 1:
                     remote_module_files_in = remote_module_files_in + " "
                 remote_module_files_in = remote_module_files_in + remote_module_file
-        remote_module_files.append(remote_module_files_in)
+            remote_module_files.append(remote_module_files_in)
     logging.info(
         "There are a total of {} remote files {}".format(
             len(remote_module_files), remote_module_files

redisbench_admin/utils/remote.py

@@ -93,13 +93,22 @@ def copy_file_to_remote_setup(
             cnopts=cnopts,
             port=port,
         )
-        srv.put(full_local_path, remote_file, callback=view_bar_simple)
-        srv.close()
+        if srv.exists(remote_file):
+            print(f"Remote file {remote_file} already exists. Skipping the copy.")
+        else:
+            uploaded_file = srv.put(
+                full_local_path, remote_file, callback=view_bar_simple
+            )
+            print(f"File uploaded to: {uploaded_file}")
         logging.info(
             "Finished Copying file {} to remote server {} ".format(
                 full_local_path, remote_file
             )
         )
+        file_info = srv.stat(remote_file)
+        print(f"Remote file size: {file_info.st_size} bytes")
+        print(f"Remote file permissions: {oct(file_info.st_mode)[-3:]}")
+        srv.close()
         res = True
     else:
         if continue_on_module_check_error:
@@ -315,7 +324,7 @@ def setup_remote_environment(
         raise_on_error=True,
     )
     infra_wait_secs = 60
-    logging.warning("Infra ready wait... for {infra_wait_secs} secs")
+    logging.warning(f"Infra ready wait... for {infra_wait_secs} secs")
     time.sleep(infra_wait_secs)
     return retrieve_tf_connection_vars(return_code, tf)
 

{redisbench_admin-0.11.27.dist-info → redisbench_admin-0.11.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.27
+Version: 0.11.29
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redisbench_admin-0.11.27.dist-info → redisbench_admin-0.11.29.dist-info}/RECORD

@@ -178,7 +178,7 @@ redisbench_admin/run/args.py,sha256=tevHZrezJ4RreHp6K-MGHko3e1Gi_IdsS2Q0jD2ZSoU,
 redisbench_admin/run/cluster.py,sha256=QuptSW-IhdyFIoQ3hzY613jtQWxBrVIlgc8OarcEK20,6072
 redisbench_admin/run/common.py,sha256=5TAxmHbUti7S3nzPzn7f-L4ls6gpStU2C4yvkiii7m4,28410
 redisbench_admin/run/ftsb/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run/ftsb/ftsb.py,sha256=aupMl27UZU6byUFsApBz5GLcdGd7lxtY6vCjJ3jnqJE,2387
+redisbench_admin/run/ftsb/ftsb.py,sha256=NP-K_hCEagmX5ayN0pQVtOdQxDTwgxKrnzz9_MLT9qQ,2492
 redisbench_admin/run/git.py,sha256=6UYGcTN0MPzf4QDVoJnFkou0yZasLF6jLG7f0zoySq8,3064
 redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkvG4,9421
 redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -190,7 +190,7 @@ redisbench_admin/run/redis_benchmark/redis_benchmark.py,sha256=e-Az2uTlt3z2W4uzl
 redisbench_admin/run/redisgraph_benchmark_go/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/redisgraph_benchmark_go/redisgraph_benchmark_go.py,sha256=DijIoWr73e2t7Zy-UmODzC51IjUh6hH5I0LaPRJW4Vk,2241
 redisbench_admin/run/redistimeseries.py,sha256=x3PA7QoHXu53zs5v0ekK2sVmUnA9_ZF2JxgCDf1Mui4,21331
-redisbench_admin/run/run.py,sha256=WIBc1q5198Ln3Elfgk6D1_ezuAKx5kM_xsxnxGe66-I,5586
+redisbench_admin/run/run.py,sha256=3_o9hDjRtrBu1LOyIZnDuVcWhFsjoY0-NCsCj40Trb4,5587
 redisbench_admin/run/s3.py,sha256=pXQXZ1rrwDCWeBegGR4aKzbKqWWwMrmqvIjFxEB3bh4,442
 redisbench_admin/run/ssh.py,sha256=gRW6ROoTKlaxLKhS5tM-Ejjd6zk2iO1KN9dzBzw7GOk,2835
 redisbench_admin/run/tsbs_run_queries_redistimeseries/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -215,28 +215,28 @@ redisbench_admin/run_remote/args.py,sha256=vhV87avBwXL8c2QLqrAkIyWD53MYhN06F-3wR
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
 redisbench_admin/run_remote/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/run_remote/notifications.py,sha256=-W9fLaftEFNfplBl2clHk37jbYxliDbHftQ62khN31k,2157
-redisbench_admin/run_remote/remote_client.py,sha256=JqxsUjyxRtsChIkOWrVTGF_mQH0_8h7v5j-5rud448Y,14079
-redisbench_admin/run_remote/remote_db.py,sha256=e6N5glOk8XRM-ohwYP68yna7L4Rb6yNmQnH1dZXKXA4,12992
+redisbench_admin/run_remote/remote_client.py,sha256=rRmDro1weto01wzqYpId8NMPoizEzSyudXBCjYrBVMs,14128
+redisbench_admin/run_remote/remote_db.py,sha256=GTBBo2G0Iu_9Zlw8Ws7WK8JJgNLJaGtSy9sXvfePeTs,13121
 redisbench_admin/run_remote/remote_env.py,sha256=Ux_0QT1unNRlKl3cakzjG5Px1uuxOOfBoF_pnalx_T8,4936
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
-redisbench_admin/run_remote/remote_helpers.py,sha256=gy10SuKheBiL568ldiOdJaHRPJ_J7DxH_uZpqgOuylo,9818
-redisbench_admin/run_remote/run_remote.py,sha256=_ntQtKXAV9Z9ak0xPKq2RYXr2yzNXMqbnUZvUgm7YJo,67821
-redisbench_admin/run_remote/standalone.py,sha256=vWmm0CdFtrasy-_1BDKO7I_gVPBjjiypv94_Fq2Sm7o,6660
+redisbench_admin/run_remote/remote_helpers.py,sha256=ngNjPJP0EwANJFhOFmujF0eSE5Ga3O0WcVuDda9cS9E,9917
+redisbench_admin/run_remote/run_remote.py,sha256=E42msGhMVnKmnMz0Kp7br1nuUaMCipC2bN0PzLxkbsw,67981
+redisbench_admin/run_remote/standalone.py,sha256=tbnKFs6wxmkRkDuxP3A420PPdb8YSmPymDlnoL2GeOQ,6745
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M1t1zfskfVkb98,21387
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=rR4UR7qBUKCg6anYooWBYb8aGaXdra0o77JiojGhJII,39834
+redisbench_admin/utils/remote.py,sha256=McW1vI-QTrzjODbt0LdjgYUDUNILUVGfgjtSoZ8ileI,40251
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
 redisbench_admin/utils/utils.py,sha256=YxuSPS6dtBw7T8e09678rUNNiCSkuFtVXNc05-qytbI,14370
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=jFGtm5ktjKuXKWvH7lnmf3pp-ch1WBJUOomXILJMDAg,6158
-redisbench_admin-0.11.27.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.27.dist-info/METADATA,sha256=bdlSis9EGgZf3SO8wvpJ1RIZzqt1DUTckVBBKQgwimk,5389
-redisbench_admin-0.11.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.27.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.27.dist-info/RECORD,,
+redisbench_admin-0.11.29.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.29.dist-info/METADATA,sha256=zvBe5oi4QAb7E2h7i8FhmeQz61tfMauMc6qignS-7aA,5389
+redisbench_admin-0.11.29.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.29.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.29.dist-info/RECORD,,