redisbench-admin 0.11.21__tar.gz → 0.11.23__tar.gz

{redisbench_admin-0.11.21 → redisbench_admin-0.11.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.21
+Version: 0.11.23
 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.21 → redisbench_admin-0.11.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.21"
+version = "0.11.23"
 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"

{redisbench_admin-0.11.21 → redisbench_admin-0.11.23}/redisbench_admin/compare/args.py

@@ -6,7 +6,7 @@
 
 # environment variables
 import datetime
-
+import os
 from redisbench_admin.run.common import get_start_time_vars, PERFORMANCE_GH_TOKEN
 from redisbench_admin.utils.remote import (
     PERFORMANCE_RTS_HOST,
@@ -29,6 +29,10 @@ _, NOW_UTC, _ = get_start_time_vars()
 LAST_MONTH_UTC = NOW_UTC - (31 * 24 * 60 * 60 * 1000)
 START_TIME_NOW_UTC, _, _ = get_start_time_vars()
 START_TIME_LAST_MONTH_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=30)
+ARCH_X86 = "x86_64"
+ARCH_ARM = "aarch64"
+VALID_ARCHS = [ARCH_X86, ARCH_ARM]
+ARCH = os.getenv("ARCH", ARCH_X86)
 
 
 def create_compare_arguments(parser):
@@ -56,6 +60,20 @@ def create_compare_arguments(parser):
     parser.add_argument("--metric_name", type=str, default=None)
     parser.add_argument("--running_platform", type=str, default=None)
     parser.add_argument("--extra-filter", type=str, default=None)
+    parser.add_argument(
+        "--baseline_architecture",
+        type=str,
+        required=False,
+        default=ARCH,
+        help=f"Architecture to filter baseline time-series. One of {VALID_ARCHS}.",
+    )
+    parser.add_argument(
+        "--comparison_architecture",
+        type=str,
+        required=False,
+        default=ARCH,
+        help=f"Architecture to filter comparison time-series. One of {VALID_ARCHS}.",
+    )
     parser.add_argument(
         "--last_n",
         type=int,

{redisbench_admin-0.11.21 → redisbench_admin-0.11.23}/redisbench_admin/compare/compare.py

@@ -22,6 +22,7 @@ from redisbench_admin.run_remote.notifications import (
     generate_new_pr_comment_notification,
 )
 from redisbench_admin.utils.remote import get_overall_dashboard_keynames
+from redisbench_admin.compare.args import ARCH_X86
 
 
 def get_project_compare_zsets(triggering_env, org, repo):
@@ -225,6 +226,8 @@ def compare_command_logic(args, project_name, project_version):
         "redisjson": "UErSC0jGk",
         "redistimeseries": "2WMw61UGz",
     }
+    baseline_architecture = args.baseline_architecture
+    comparison_architecture = args.comparison_architecture
     uid = None
     if tf_github_repo.lower() in grafana_dashboards_uids:
         uid = grafana_dashboards_uids[tf_github_repo.lower()]
@@ -274,6 +277,8 @@ def compare_command_logic(args, project_name, project_version):
         to_ts_ms,
         use_metric_context_path,
         running_platform,
+        baseline_architecture,
+        comparison_architecture,
     )
     comment_body = ""
     if total_comparison_points > 0:
@@ -498,6 +503,8 @@ def compute_regression_table(
     to_ts_ms=None,
     use_metric_context_path=None,
     running_platform=None,
+    baseline_architecture=ARCH_X86,
+    comparison_architecture=ARCH_X86,
 ):
     START_TIME_NOW_UTC, _, _ = get_start_time_vars()
     START_TIME_LAST_MONTH_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=31)
@@ -584,6 +591,8 @@ def compute_regression_table(
         tf_triggering_env,
         verbose,
         running_platform,
+        baseline_architecture,
+        comparison_architecture,
     )
     logging.info(
         "Printing differential analysis between {} and {}".format(
@@ -711,6 +720,8 @@ def from_rts_to_regression_table(
     tf_triggering_env,
     verbose,
     running_platform=None,
+    baseline_architecture=ARCH_X86,
+    comparison_architecture=ARCH_X86,
 ):
     print_all = print_regressions_only is False and print_improvements_only is False
     table = []
@@ -735,6 +746,8 @@ def from_rts_to_regression_table(
         ]
         if running_platform is not None:
             filters_baseline.append("running_platform={}".format(running_platform))
+        if baseline_architecture != ARCH_X86:
+            filters_baseline.append(f"arch={baseline_architecture}")
         filters_comparison = [
             "{}={}".format(by_str_comparison, comparison_str),
             "metric={}".format(metric_name),
@@ -744,6 +757,8 @@ def from_rts_to_regression_table(
         ]
         if running_platform is not None:
             filters_comparison.append("running_platform={}".format(running_platform))
+        if comparison_architecture != ARCH_X86:
+            filters_comparison.append(f"arch={comparison_architecture}")
         baseline_timeseries = rts.ts().queryindex(filters_baseline)
         comparison_timeseries = rts.ts().queryindex(filters_comparison)
 

{redisbench_admin-0.11.21 → redisbench_admin-0.11.23}/redisbench_admin/run_remote/remote_db.py

@@ -372,6 +372,7 @@ def remote_db_spin(
         benchmark_config,
         redis_conns,
         ignore_keyspace_errors,
+        keyspace_check_timeout,
     )
     artifact_version = run_redis_pre_steps(
         benchmark_config, redis_conns[0], required_modules

{redisbench_admin-0.11.21 → redisbench_admin-0.11.23}/redisbench_admin/utils/remote.py

@@ -29,6 +29,12 @@ from redisbench_admin.utils.utils import (
     EC2_ACCESS_KEY,
 )
 
+ARCH_X86 = "x86_64"
+ARCH_ARM = "aarch64"
+VALID_ARCHS = [ARCH_X86, ARCH_ARM]
+ARCH = os.getenv("ARCH", ARCH_X86)
+
+
 # environment variables
 PERFORMANCE_RTS_PUSH = bool(int(os.getenv("PUSH_RTS", "0")))
 PERFORMANCE_RTS_AUTH = os.getenv("PERFORMANCE_RTS_AUTH", None)
@@ -929,6 +935,7 @@ def get_ts_tags_and_name(
     tf_github_repo,
     tf_triggering_env,
     use_metric_context_path,
+    arch=ARCH_X86,
 ):
     # prepare tags
     timeserie_tags = get_project_ts_tags(
@@ -956,6 +963,7 @@ def get_ts_tags_and_name(
         )
     timeserie_tags["metric"] = str(metric_name)
     timeserie_tags["metric_name"] = metric_name
+    timeserie_tags["arch"] = arch
     timeserie_tags["metric_context_path"] = metric_context_path
     if metric_context_path is not None:
         timeserie_tags["test_name:metric_context_path"] = "{}:{}".format(
@@ -978,6 +986,7 @@ def get_ts_tags_and_name(
         use_metric_context_path,
         build_variant_name,
         running_platform,
+        arch,
     )
     return timeserie_tags, ts_name
 

{redisbench_admin-0.11.21 → redisbench_admin-0.11.23}/redisbench_admin/utils/utils.py

@@ -331,6 +331,7 @@ def get_ts_metric_name(
     use_metric_context_path=False,
     build_variant_name=None,
     running_platform=None,
+    arch="x86_64",
 ):
     if use_metric_context_path:
         metric_name = "{}/{}".format(metric_name, metric_context_path)
@@ -361,6 +362,11 @@ def get_ts_metric_name(
             metric=metric_name,
         )
     )
+    if arch != "x86_64":
+        logging.info(
+            f"Extending timeseries name with architecture given it's not x86. arch={arch}"
+        )
+        ts_name = ts_name + f"arch={arch}"
     return ts_name