redisbench-admin 0.10.17__py3-none-any.whl → 0.10.19__py3-none-any.whl

redisbench_admin/compare/compare.py

@@ -649,7 +649,7 @@ def get_by_strings(
         baseline_str = baseline_branch
     if comparison_branch is not None:
         comparison_covered = True
-        by_str_baseline = "branch"
+        by_str_comparison = "branch"
         comparison_str = comparison_branch
 
     if baseline_tag is not None:
@@ -722,6 +722,7 @@ def from_rts_to_regression_table(
     total_comparison_points = 0
     noise_waterline = 3
     progress = tqdm(unit="benchmark time-series", total=len(test_names))
+    at_comparison=0
     for test_name in test_names:
         multi_value_baseline = check_multi_value_filter(baseline_str)
         multi_value_comparison = check_multi_value_filter(comparison_str)
@@ -960,7 +961,12 @@ def check_multi_value_filter(baseline_str):
 
 
 def prepare_value_str(baseline_pct_change, baseline_v, baseline_values, simplify_table):
-    baseline_v_str = " {:.0f}".format(baseline_v)
+    if baseline_v < 1.0:
+        baseline_v_str = " {:.2f}".format(baseline_v)
+    elif baseline_v < 10.0:
+        baseline_v_str = " {:.1f}".format(baseline_v)
+    else:
+        baseline_v_str = " {:.0f}".format(baseline_v)
     stamp_b = ""
     if baseline_pct_change > 10.0:
         stamp_b = "UNSTABLE "

redisbench_admin/run_remote/remote_env.py

@@ -31,6 +31,8 @@ def remote_env_setup(
     tf_override_name=None,
     tf_folder_path=None,
     spot_instance_error=False,
+    spot_price_counter=0,
+    full_price_counter=0,
 ):
     server_plaintext_port = args.db_port
     db_ssh_port = args.db_ssh_port
@@ -85,6 +87,7 @@ def remote_env_setup(
                         tf_folder_spot_path,
                     )
                     spot_available_and_used = True
+                    spot_price_counter = spot_price_counter + 1
                 except TerraformCommandError as error:
                     spot_instance_error = True
                     logging.error(
@@ -95,7 +98,7 @@ def remote_env_setup(
                     pass
             else:
                 logging.warning(
-                    f"Even though there is a spot instance config, avoiding deploying it."
+                    "Even though there is a spot instance config, avoiding deploying it."
                 )
         if spot_available_and_used is False:
             (
@@ -121,6 +124,7 @@ def remote_env_setup(
                 tf_override_name,
                 tf_folder_path,
             )
+            full_price_counter = full_price_counter + 1
     logging.info("Using the following connection addresses.")
     logging.info(f"client_public_ip={client_public_ip}")
     logging.info(f"server_public_ip={server_public_ip}")
@@ -134,4 +138,6 @@ def remote_env_setup(
         client_ssh_port,
         username,
         spot_instance_error,
+        spot_price_counter,
+        full_price_counter,
     )

redisbench_admin/run_remote/remote_helpers.py

@@ -286,8 +286,12 @@ def post_process_remote_run(
             start_time_str,
             stdout,
         )
-    with open(local_benchmark_output_filename, "r") as json_file:
-        results_dict = json.load(json_file)
+    try:
+        with open(local_benchmark_output_filename, "r") as json_file:
+            results_dict = json.load(json_file)
+    except json.decoder.JSONDecodeError as e:
+        logging.error("Received error while decoding JSON: {}".format(e.__str__()))
+        pass
     # check KPIs
     return_code = results_dict_kpi_check(benchmark_config, results_dict, return_code)
     # if the benchmark tool is redisgraph-benchmark-go and

redisbench_admin/run_remote/run_remote.py

@@ -306,6 +306,8 @@ def run_remote_command_logic(args, project_name, project_version):
 
     # Used to only deploy spot once per run
     spot_instance_error = False
+    ts_key_spot_price = f"ts:{tf_triggering_env}:tests:spot_price"
+    ts_key_full_price = f"ts:{tf_triggering_env}:tests:full_price"
 
     for benchmark_type, bench_by_dataset_map in benchmark_runs_plan.items():
         if return_code != 0 and args.fail_fast:
@@ -418,6 +420,8 @@ def run_remote_command_logic(args, project_name, project_version):
                                     client_ssh_port,
                                     username,
                                     spot_instance_error,
+                                    spot_price_counter,
+                                    full_price_counter,
                                 ) = remote_env_setup(
                                     args,
                                     benchmark_config,
@@ -435,6 +439,8 @@ def run_remote_command_logic(args, project_name, project_version):
                                     TF_OVERRIDE_NAME,
                                     TF_OVERRIDE_REMOTE,
                                     spot_instance_error,
+                                    0,
+                                    0,
                                 )
 
                                 # after we've created the env, even on error we should always teardown
@@ -442,9 +448,28 @@ def run_remote_command_logic(args, project_name, project_version):
                                 try:
                                     (
                                         _,
-                                        _,
+                                        start_time_setup_ms,
                                         testcase_start_time_str,
                                     ) = get_start_time_vars()
+                                    if args.push_results_redistimeseries:
+                                        logging.info(
+                                            f"Updating overall spot price tests counter {ts_key_spot_price}"
+                                        )
+                                        rts.ts().add(
+                                            ts_key_spot_price,
+                                            start_time_setup_ms,
+                                            spot_price_counter,
+                                            duplicate_policy="sum",
+                                        )
+                                        logging.info(
+                                            f"Updating overall spot price full counter {ts_key_spot_price}"
+                                        )
+                                        rts.ts().add(
+                                            ts_key_full_price,
+                                            start_time_setup_ms,
+                                            full_price_counter,
+                                            duplicate_policy="sum",
+                                        )
                                     logname = "{}_{}.log".format(
                                         test_name, testcase_start_time_str
                                     )
@@ -871,7 +896,9 @@ def run_remote_command_logic(args, project_name, project_version):
                                                 )
                                                 return_code |= 1
                                                 raise Exception(
-                                                    "Failed to run remote benchmark."
+                                                    "Failed to run remote benchmark. {}".format(
+                                                        e.__str__()
+                                                    )
                                                 )
 
                                         if setup_details["env"] is None:

redisbench_admin/utils/benchmark_config.py

@@ -49,6 +49,7 @@ def parse_exporter_timemetric(metric_path: str, results_dict: dict):
         logging.error(
             "Unable to parse time-metric {}. Error: {}".format(metric_path, e.__str__())
         )
+        pass
     return datapoints_timestamp
 
 

redisbench_admin/utils/remote.py

@@ -578,8 +578,6 @@ def fetch_remote_setup_from_config(
                 setup_type = remote_setup_property["type"]
             if "setup" in remote_setup_property:
                 setup = remote_setup_property["setup"]
-            if "spot_instance" in remote_setup_property:
-                spot_path = "/terraform/" + remote_setup_property["spot_instance"]
         # fetch terraform folder
         path = "/terraform/{}-{}".format(setup_type, setup)
     terraform_working_dir = common_tf(branch, path, repo)

redisbench_admin/watchdog/watchdog.py

@@ -45,13 +45,14 @@ def get_ci_ec2_instances_by_state(ec2_client, ci_machines_prefix, requested_stat
 def get_vname_timeout_secs(instance):
     vm_name = ""
     timeout_secs = None
-    for tag_dict in instance["Tags"]:
-        key = tag_dict["Key"]
-        key_v = tag_dict["Value"]
-        if key == "Name":
-            vm_name = key_v
-        if key == "timeout_secs":
-            timeout_secs = int(key_v)
+    if "Tags" in instance:
+        for tag_dict in instance["Tags"]:
+            key = tag_dict["Key"]
+            key_v = tag_dict["Value"]
+            if key == "Name":
+                vm_name = key_v
+            if key == "timeout_secs":
+                timeout_secs = int(key_v)
     return vm_name, timeout_secs
 
 
@@ -94,7 +95,8 @@ def termination_check(
     total_instances,
     vm_name,
 ):
-    if ci_machines_prefix in vm_name:
+    # terminates also VMs without name set
+    if ci_machines_prefix in vm_name or vm_name == "":
         total_instances = total_instances + 1
         elapsed = current_datetime - launch_time
         will_terminate = False

{redisbench_admin-0.10.17.dist-info → redisbench_admin-0.10.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.10.17
+Version: 0.10.19
 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.10.17.dist-info → redisbench_admin-0.10.19.dist-info}/RECORD

@@ -4,7 +4,7 @@ redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGK
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/compare/args.py,sha256=10zbiT8roeTGnAubvoVFZTbJNbVxuRaRPtCKjxV8iNE,5226
-redisbench_admin/compare/compare.py,sha256=P6vUu_GMLBvsMVhcBn0TTIpgi-qUFJMwKy6Uulsryv0,37548
+redisbench_admin/compare/compare.py,sha256=g1OIapQ-En546WwQsKbfD1hCFpgh_2PhR6nCAATfsc0,37745
 redisbench_admin/deploy/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/deploy/args.py,sha256=neLUcQqI__HkJItkQg2C293hl5g3yHG40t171r7-E5Y,1732
 redisbench_admin/deploy/deploy.py,sha256=c1srxDMaUHuyh6wGdgLqzTz3ljZFtGqiumtAmguVyuk,3791
@@ -217,26 +217,26 @@ redisbench_admin/run_remote/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNd
 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=a1_fnLhsCGv_0HMBB91zscHTFcHwmab_u1W7u-u1r3E,12929
-redisbench_admin/run_remote/remote_env.py,sha256=HDhriHm_4LSuZLTM-0cIUBddaGEA_qKL7RMFywpUcQs,4378
+redisbench_admin/run_remote/remote_env.py,sha256=fTZliXW7Cz0ztew7IR2BNlqLd_l4_p-5Oc6rX7T5EdI,4605
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
-redisbench_admin/run_remote/remote_helpers.py,sha256=sLlXV-W7qP-8-S9MuDm5UIOEZCePOFnhtNlhe6N7Qtg,9658
-redisbench_admin/run_remote/run_remote.py,sha256=yjuWdowqAIAllLVD64jVZGjzXdZPRcv6tARSenq55Pg,65710
+redisbench_admin/run_remote/remote_helpers.py,sha256=gy10SuKheBiL568ldiOdJaHRPJ_J7DxH_uZpqgOuylo,9818
+redisbench_admin/run_remote/run_remote.py,sha256=OYD8vDpfy_v6x7149_RzGetBmqVI6dRzWirpo2x88wo,67380
 redisbench_admin/run_remote/standalone.py,sha256=vWmm0CdFtrasy-_1BDKO7I_gVPBjjiypv94_Fq2Sm7o,6660
 redisbench_admin/run_remote/terraform.py,sha256=zD2gGuOmnTex6Dt2lhdAtNn21iL6sykPPXI10jJaim4,3945
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/utils/benchmark_config.py,sha256=Bjh2PbMiUQZ70hwqsP4WhRbkV3S4iETN0rQO3OvINQw,21278
+redisbench_admin/utils/benchmark_config.py,sha256=bvhqKFENdDXpSZvF41EDUwMMhJJ4WQf7DS2BHn8hOz0,21291
 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=pnHJIdYYY-y_9iqRsCCe75FXn4CCNahXLnFhS5MT35s,37966
+redisbench_admin/utils/remote.py,sha256=wmDuI0hTe1ntsE9kSn80bhVavPrTxODL1ENhoWRyeJ4,37826
 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=FLDjhGkW0PWwcu_nlTnIW6aZtHzJGz4LIwvu1CpCajw,14160
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
-redisbench_admin/watchdog/watchdog.py,sha256=vN6zs8z9rdKtQAh0O4iN-vOuQtgfrjZKh4wDqnyPCvk,6043
-redisbench_admin-0.10.17.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.10.17.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.10.17.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-redisbench_admin-0.10.17.dist-info/METADATA,sha256=q0b0QhxeZVSAFXjU1-ISjvoJqrpa3LriYT7w51-YIlc,5336
-redisbench_admin-0.10.17.dist-info/RECORD,,
+redisbench_admin/watchdog/watchdog.py,sha256=jFGtm5ktjKuXKWvH7lnmf3pp-ch1WBJUOomXILJMDAg,6158
+redisbench_admin-0.10.19.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.10.19.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.10.19.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+redisbench_admin-0.10.19.dist-info/METADATA,sha256=DSCii5-Q85r5PJ5Pg3x2vT32LKG3e0MA4aglBkDmD5A,5336
+redisbench_admin-0.10.19.dist-info/RECORD,,