redis-benchmarks-specification 0.1.322__tar.gz → 0.1.323__tar.gz

{redis_benchmarks_specification-0.1.322 → redis_benchmarks_specification-0.1.323}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redis-benchmarks-specification
-Version: 0.1.322
+Version: 0.1.323
 Summary: The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute.
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redis_benchmarks_specification-0.1.322 → redis_benchmarks_specification-0.1.323}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redis-benchmarks-specification"
-version = "0.1.322"
+version = "0.1.323"
 description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "Readme.md"

{redis_benchmarks_specification-0.1.322 → redis_benchmarks_specification-0.1.323}/redis_benchmarks_specification/__builder__/builder.py

@@ -73,6 +73,18 @@ def main():
     parser.add_argument(
         "--arch", type=str, default="amd64", help="arch to build artifacts"
     )
+    parser.add_argument(
+        "--builder-group",
+        type=str,
+        default=STREAM_GH_EVENTS_COMMIT_BUILDERS_CG,
+        help="Consumer group name to read from the stream",
+    )
+    parser.add_argument(
+        "--builder-id",
+        type=str,
+        default="1",
+        help="Consumer id to read from the stream",
+    )
     parser.add_argument(
         "--setups-folder",
         type=str,
@@ -149,7 +161,14 @@ def main():
 
     build_spec_image_prefetch(builders_folder, different_build_specs)
 
-    builder_consumer_group_create(conn)
+    builder_group = args.builder_group
+    builder_id = args.builder_id
+    if builder_group is None:
+        builder_group = STREAM_GH_EVENTS_COMMIT_BUILDERS_CG
+    if builder_id is None:
+        builder_id = "1"
+
+    builder_consumer_group_create(conn, builder_group)
     if args.github_token is not None:
         logging.info("detected a github token. will update as much as possible!!! =)")
     previous_id = args.consumer_start_id
@@ -162,28 +181,26 @@ def main():
             args.docker_air_gap,
             arch,
             args.github_token,
+            builder_group,
+            builder_id,
         )
 
 
-def builder_consumer_group_create(conn, id="$"):
+def builder_consumer_group_create(
+    conn, builder_group=STREAM_GH_EVENTS_COMMIT_BUILDERS_CG, id="$"
+):
     try:
         conn.xgroup_create(
             STREAM_KEYNAME_GH_EVENTS_COMMIT,
-            STREAM_GH_EVENTS_COMMIT_BUILDERS_CG,
+            builder_group,
             mkstream=True,
             id=id,
         )
         logging.info(
-            "Created consumer group named {} to distribute work.".format(
-                STREAM_GH_EVENTS_COMMIT_BUILDERS_CG
-            )
+            "Created consumer group named {} to distribute work.".format(builder_group)
         )
     except redis.exceptions.ResponseError:
-        logging.info(
-            "Consumer group named {} already existed.".format(
-                STREAM_GH_EVENTS_COMMIT_BUILDERS_CG
-            )
-        )
+        logging.info("Consumer group named {} already existed.".format(builder_group))
 
 
 def check_benchmark_build_comment(comments):
@@ -205,14 +222,22 @@ def builder_process_stream(
     docker_air_gap=False,
     arch="amd64",
     github_token=None,
+    builder_group=None,
+    builder_id=None,
 ):
     new_builds_count = 0
     auto_approve_github_comments = True
     build_stream_fields_arr = []
-    logging.info("Entering blocking read waiting for work.")
-    consumer_name = "{}-proc#{}".format(STREAM_GH_EVENTS_COMMIT_BUILDERS_CG, "1")
+    if builder_group is None:
+        builder_group = STREAM_GH_EVENTS_COMMIT_BUILDERS_CG
+    if builder_id is None:
+        builder_id = "1"
+    consumer_name = "{}-proc#{}".format(builder_group, builder_id)
+    logging.info(
+        f"Entering blocking read waiting for work. building for arch: {arch}. Using consumer id {consumer_name}"
+    )
     newTestInfo = conn.xreadgroup(
-        STREAM_GH_EVENTS_COMMIT_BUILDERS_CG,
+        builder_group,
         consumer_name,
         {STREAM_KEYNAME_GH_EVENTS_COMMIT: previous_id},
         count=1,
@@ -230,6 +255,21 @@ def builder_process_stream(
         docker_client = docker.from_env()
         from pathlib import Path
 
+        build_request_arch = None
+        if b"arch" in testDetails:
+            build_request_arch = testDetails[b"arch"].decode()
+        elif b"build_arch" in testDetails:
+            build_request_arch = testDetails[b"build_arch"].decode()
+        else:
+            logging.info("No arch info found on the stream.")
+        if build_request_arch is not None and build_request_arch != arch:
+            logging.info(
+                "skipping build request given requested build arch {}!={}".format(
+                    build_request_arch, arch
+                )
+            )
+            return previous_id, new_builds_count, build_stream_fields_arr
+
         home = str(Path.home())
         if b"git_hash" in testDetails:
             git_hash = testDetails[b"git_hash"]

{redis_benchmarks_specification-0.1.322 → redis_benchmarks_specification-0.1.323}/redis_benchmarks_specification/__cli__/args.py

@@ -138,7 +138,7 @@ def spec_cli_args(parser):
     parser.add_argument("--gh_repo", type=str, default="redis")
     parser.add_argument("--server_name", type=str, default=None)
     parser.add_argument("--run_image", type=str, default="redis")
-    parser.add_argument("--build_arch", type=str, default="amd64")
+    parser.add_argument("--build_arch", type=str, default=None)
     parser.add_argument("--id", type=str, default="dockerhub")
     parser.add_argument("--mnt_point", type=str, default="")
     parser.add_argument("--trigger-unstable-commits", type=bool, default=True)

{redis_benchmarks_specification-0.1.322 → redis_benchmarks_specification-0.1.323}/redis_benchmarks_specification/__cli__/cli.py

@@ -432,6 +432,9 @@ def trigger_tests_cli_command_logic(args, project_name, project_version):
             commit_dict["tests_groups_regexp"] = tests_groups_regexp
             commit_dict["github_org"] = args.gh_org
             commit_dict["github_repo"] = args.gh_repo
+            if args.build_arch is not None:
+                commit_dict["build_arch"] = args.build_arch
+                commit_dict["arch"] = args.build_arch
             if args.server_name is not None and args.server_name != "":
                 commit_dict["server_name"] = args.server_name
             if args.build_artifacts != "":