redis-benchmarks-specification 0.1.209__py3-none-any.whl → 0.1.211__py3-none-any.whl

redis_benchmarks_specification/__builder__/builder.py

@@ -312,28 +312,7 @@ def builder_process_stream(
                 if "run_image" in build_config:
                     run_image = build_config["run_image"]
                 if docker_air_gap:
-                    airgap_key = "docker:air-gap:{}".format(run_image)
-                    logging.info(
-                        "DOCKER AIR GAP: storing run image named: {} in redis key {}".format(
-                            run_image, airgap_key
-                        )
-                    )
-                    run_image_binary_stream = io.BytesIO()
-                    run_image_docker = docker_client.images.get(run_image)
-                    for chunk in run_image_docker.save():
-                        run_image_binary_stream.write(chunk)
-                    # 7 days expire
-                    binary_exp_secs = 24 * 60 * 60 * 7
-                    res_airgap = conn.set(
-                        airgap_key,
-                        run_image_binary_stream.getbuffer(),
-                        ex=binary_exp_secs,
-                    )
-                    logging.info(
-                        "DOCKER AIR GAP: result of set bin data to {}: {}".format(
-                            airgap_key, res_airgap
-                        )
-                    )
+                    store_airgap_image_redis(conn, docker_client, run_image)
 
                 compiler = build_config["compiler"]
                 cpp_compiler = build_config["cpp_compiler"]
@@ -429,48 +408,32 @@ def builder_process_stream(
                 build_duration = build_end_datetime - build_start_datetime
                 build_duration_secs = build_duration.total_seconds()
 
-                build_stream_fields = {
-                    "id": id,
-                    "git_hash": git_hash,
-                    "use_git_timestamp": str(use_git_timestamp),
-                    "build_image": build_image,
-                    "run_image": run_image,
-                    "compiler": compiler,
-                    "cpp_compiler": cpp_compiler,
-                    "os": build_os,
-                    "arch": build_arch,
-                    "build_vars": build_vars_str,
-                    "build_command": build_command,
-                    "metadata": json.dumps(build_config_metadata),
-                    "build_artifacts": ",".join(build_artifacts),
-                    "tests_regexp": tests_regexp,
-                    "tests_priority_upper_limit": tests_priority_upper_limit,
-                    "tests_priority_lower_limit": tests_priority_lower_limit,
-                    "tests_groups_regexp": tests_groups_regexp,
-                }
-                if pull_request is not None:
-                    build_stream_fields["pull_request"] = pull_request
-                if git_branch is not None:
-                    build_stream_fields["git_branch"] = git_branch
-                if git_version is not None:
-                    build_stream_fields["git_version"] = git_version
-                if git_timestamp_ms is not None:
-                    build_stream_fields["git_timestamp_ms"] = git_timestamp_ms
-                for artifact in build_artifacts:
-                    bin_key = "zipped:artifacts:{}:{}.zip".format(id, artifact)
-                    bin_artifact = open(
-                        "{}src/{}".format(redis_temporary_dir, artifact), "rb"
-                    ).read()
-                    bin_artifact_len = len(bytes(bin_artifact))
-                    assert bin_artifact_len > 0
-                    conn.set(bin_key, bytes(bin_artifact), ex=REDIS_BINS_EXPIRE_SECS)
-                    build_stream_fields[artifact] = bin_key
-                    build_stream_fields[
-                        "{}_len_bytes".format(artifact)
-                    ] = bin_artifact_len
-                result = True
-                if b"platform" in testDetails:
-                    build_stream_fields["platform"] = testDetails[b"platform"]
+                build_stream_fields, result = generate_benchmark_stream_request(
+                    id,
+                    conn,
+                    run_image,
+                    build_arch,
+                    testDetails,
+                    build_os,
+                    build_artifacts,
+                    build_command,
+                    build_config_metadata,
+                    build_image,
+                    build_vars_str,
+                    compiler,
+                    cpp_compiler,
+                    git_branch,
+                    git_hash,
+                    git_timestamp_ms,
+                    git_version,
+                    pull_request,
+                    redis_temporary_dir,
+                    tests_groups_regexp,
+                    tests_priority_lower_limit,
+                    tests_priority_upper_limit,
+                    tests_regexp,
+                    use_git_timestamp,
+                )
                 if result is True:
                     benchmark_stream_id = conn.xadd(
                         STREAM_KEYNAME_NEW_BUILD_EVENTS, build_stream_fields
@@ -551,6 +514,109 @@ def builder_process_stream(
     return previous_id, new_builds_count, build_stream_fields_arr
 
 
+def store_airgap_image_redis(conn, docker_client, run_image):
+    airgap_key = "docker:air-gap:{}".format(run_image)
+    logging.info(
+        "DOCKER AIR GAP: storing run image named: {} in redis key {}".format(
+            run_image, airgap_key
+        )
+    )
+    run_image_binary_stream = io.BytesIO()
+    run_image_docker = docker_client.images.get(run_image)
+    for chunk in run_image_docker.save():
+        run_image_binary_stream.write(chunk)
+    # 7 days expire
+    binary_exp_secs = 24 * 60 * 60 * 7
+    res_airgap = conn.set(
+        airgap_key,
+        run_image_binary_stream.getbuffer(),
+        ex=binary_exp_secs,
+    )
+    logging.info(
+        "DOCKER AIR GAP: result of set bin data to {}: {}".format(
+            airgap_key, res_airgap
+        )
+    )
+
+
+def generate_benchmark_stream_request(
+    id,
+    conn,
+    run_image,
+    build_arch,
+    testDetails,
+    build_os,
+    build_artifacts=[],
+    build_command=None,
+    build_config_metadata=None,
+    build_image=None,
+    build_vars_str=None,
+    compiler=None,
+    cpp_compiler=None,
+    git_branch=None,
+    git_hash=None,
+    git_timestamp_ms=None,
+    git_version=None,
+    pull_request=None,
+    redis_temporary_dir=None,
+    tests_groups_regexp=".*",
+    tests_priority_lower_limit=0,
+    tests_priority_upper_limit=10000,
+    tests_regexp=".*",
+    use_git_timestamp=False,
+):
+    build_stream_fields = {
+        "id": id,
+        "use_git_timestamp": str(use_git_timestamp),
+        "run_image": run_image,
+        "os": build_os,
+        "arch": build_arch,
+        "build_artifacts": ",".join(build_artifacts),
+        "tests_regexp": tests_regexp,
+        "tests_priority_upper_limit": tests_priority_upper_limit,
+        "tests_priority_lower_limit": tests_priority_lower_limit,
+        "tests_groups_regexp": tests_groups_regexp,
+    }
+    if build_config_metadata is not None:
+        build_stream_fields["metadata"] = json.dumps(build_config_metadata)
+    if compiler is not None:
+        build_stream_fields["compiler"] = compiler
+    if cpp_compiler is not None:
+        build_stream_fields["cpp_compiler"] = cpp_compiler
+    if build_vars_str is not None:
+        build_stream_fields["build_vars"] = build_vars_str
+    if build_command is not None:
+        build_stream_fields["build_command"] = build_command
+    if build_image is not None:
+        build_stream_fields["build_image"] = build_image
+    else:
+        build_stream_fields["build_image"] = run_image
+    if git_hash is not None:
+        build_stream_fields["git_hash"] = git_hash
+    if pull_request is not None:
+        build_stream_fields["pull_request"] = pull_request
+    if git_branch is not None:
+        build_stream_fields["git_branch"] = git_branch
+    if git_version is not None:
+        build_stream_fields["git_version"] = git_version
+    if git_timestamp_ms is not None:
+        build_stream_fields["git_timestamp_ms"] = git_timestamp_ms
+    for artifact in build_artifacts:
+        bin_key = "zipped:artifacts:{}:{}.zip".format(id, artifact)
+        bin_artifact = open(
+            "{}src/{}".format(redis_temporary_dir, artifact), "rb"
+        ).read()
+        bin_artifact_len = len(bytes(bin_artifact))
+        assert bin_artifact_len > 0
+        conn.set(bin_key, bytes(bin_artifact), ex=REDIS_BINS_EXPIRE_SECS)
+        build_stream_fields[artifact] = bin_key
+        build_stream_fields["{}_len_bytes".format(artifact)] = bin_artifact_len
+    result = True
+    if b"platform" in testDetails:
+        build_stream_fields["platform"] = testDetails[b"platform"]
+    return build_stream_fields, result
+
+
 def build_spec_image_prefetch(builders_folder, different_build_specs):
     logging.info("checking build spec requirements")
     already_checked_images = []

redis_benchmarks_specification/__cli__/args.py

@@ -21,6 +21,7 @@ START_TIME_NOW_UTC, _, _ = get_start_time_vars()
 START_TIME_LAST_YEAR_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=90)
 CLI_TOOL_STATS = "stats"
 CLI_TOOL_TRIGGER = "trigger"
+CLI_TOOL_DOCKERHUB = "dockerhub"
 PERFORMANCE_GH_TOKEN = os.getenv("PERFORMANCE_GH_TOKEN", None)
 
 
@@ -109,7 +110,7 @@ def spec_cli_args(parser):
         type=str,
         default=CLI_TOOL_TRIGGER,
         help="subtool to use. One of '{}' ".format(
-            ",".join([CLI_TOOL_STATS, CLI_TOOL_TRIGGER])
+            ",".join([CLI_TOOL_STATS, CLI_TOOL_TRIGGER, CLI_TOOL_DOCKERHUB])
         ),
     )
     parser.add_argument("--gh_token", type=str, default=GH_TOKEN)
@@ -129,7 +130,18 @@ def spec_cli_args(parser):
     parser.add_argument("--redis_repo", type=str, default=None)
     parser.add_argument("--gh_org", type=str, default="redis")
     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("--id", type=str, default="dockerhub")
+    parser.add_argument("--mnt_point", type=str, default="")
     parser.add_argument("--trigger-unstable-commits", type=bool, default=True)
+    parser.add_argument(
+        "--docker-dont-air-gap",
+        default=False,
+        action="store_true",
+        help="Dont store the docker images in redis keys.",
+    )
     parser.add_argument(
         "--use-tags",
         default=False,

redis_benchmarks_specification/__cli__/cli.py

@@ -12,14 +12,18 @@ import shutil
 import subprocess
 import sys
 import tempfile
+
+import docker
 import git
 import packaging
 import redis
 from packaging import version
 import time
-from github import Github
-
 
+from redis_benchmarks_specification.__builder__.builder import (
+    generate_benchmark_stream_request,
+    store_airgap_image_redis,
+)
 from redis_benchmarks_specification.__common__.github import (
     update_comment_if_needed,
     create_new_pr_comment,
@@ -39,6 +43,7 @@ from redis_benchmarks_specification.__common__.env import (
     REDIS_BINS_EXPIRE_SECS,
     STREAM_KEYNAME_GH_EVENTS_COMMIT,
     STREAM_GH_EVENTS_COMMIT_BUILDERS_CG,
+    STREAM_KEYNAME_NEW_BUILD_EVENTS,
 )
 from redis_benchmarks_specification.__common__.package import (
     get_version_string,
@@ -53,6 +58,59 @@ logging.basicConfig(
 )
 
 
+def trigger_tests_dockerhub_cli_command_logic(args, project_name, project_version):
+    logging.info(
+        "Using: {project_name} {project_version}".format(
+            project_name=project_name, project_version=project_version
+        )
+    )
+    logging.info(
+        "Checking connection to redis with user: {}, host: {}, port: {}".format(
+            args.redis_user,
+            args.redis_host,
+            args.redis_port,
+        )
+    )
+    conn = redis.StrictRedis(
+        host=args.redis_host,
+        port=args.redis_port,
+        password=args.redis_pass,
+        username=args.redis_user,
+        decode_responses=False,
+    )
+    conn.ping()
+    testDetails = {}
+    build_stream_fields, result = generate_benchmark_stream_request(
+        args.id,
+        conn,
+        args.run_image,
+        args.build_arch,
+        testDetails,
+        "n/a",
+    )
+    build_stream_fields["github_repo"] = args.gh_repo
+    build_stream_fields["github_org"] = args.gh_org
+    build_stream_fields["restore_build_artifacts"] = "False"
+    server_name = args.gh_repo
+    if args.server_name is not None:
+        server_name = args.server_name
+    build_stream_fields["server_name"] = server_name
+    build_stream_fields["mnt_point"] = args.mnt_point
+    if args.docker_dont_air_gap is False:
+        docker_client = docker.from_env()
+        store_airgap_image_redis(conn, docker_client, args.run_image)
+
+    if result is True:
+        benchmark_stream_id = conn.xadd(
+            STREAM_KEYNAME_NEW_BUILD_EVENTS, build_stream_fields
+        )
+        logging.info(
+            "sucessfully requested a new run {}. Stream id: {}".format(
+                build_stream_fields, benchmark_stream_id
+            )
+        )
+
+
 def main():
     _, _, project_version = populate_with_poetry_data()
     project_name = "redis-benchmarks-spec-cli"
@@ -66,6 +124,8 @@ def main():
         trigger_tests_cli_command_logic(args, project_name, project_version)
     if args.tool == "stats":
         generate_stats_cli_command_logic(args, project_name, project_version)
+    if args.tool == "dockerhub":
+        trigger_tests_dockerhub_cli_command_logic(args, project_name, project_version)
 
 
 def get_commits_by_branch(args, repo):
@@ -349,7 +409,11 @@ def trigger_tests_cli_command_logic(args, project_name, project_version):
             if result is True:
                 stream_id = "n/a"
                 if args.dry_run is False:
-                    (result, reply_fields, error_msg,) = request_build_from_commit_info(
+                    (
+                        result,
+                        reply_fields,
+                        error_msg,
+                    ) = request_build_from_commit_info(
                         conn,
                         commit_dict,
                         {},

redis_benchmarks_specification/__common__/env.py

@@ -45,7 +45,7 @@ GH_REDIS_SERVER_USER = os.getenv("GH_REDIS_SERVER_USER", None)
 
 # DB used to authenticate ( read-only/non-dangerous access only )
 REDIS_AUTH_SERVER_HOST = os.getenv("REDIS_AUTH_SERVER_HOST", "localhost")
-REDIS_AUTH_SERVER_PORT = int(os.getenv("REDIS_AUTH_SERVER_PORT", "6380"))
+REDIS_AUTH_SERVER_PORT = int(os.getenv("REDIS_AUTH_SERVER_PORT", "6379"))
 REDIS_HEALTH_CHECK_INTERVAL = int(os.getenv("REDIS_HEALTH_CHECK_INTERVAL", "15"))
 REDIS_SOCKET_TIMEOUT = int(os.getenv("REDIS_SOCKET_TIMEOUT", "300"))
 REDIS_BINS_EXPIRE_SECS = int(

redis_benchmarks_specification/__common__/github.py

@@ -24,9 +24,7 @@ def generate_build_started_pr_comment(
     tests_priority_upper_limit,
     tests_regexp,
 ):
-    comment_body = (
-        f"### CE Performance Automation : step 1 of 2 (build) STARTING...\n\n"
-    )
+    comment_body = "### CE Performance Automation : step 1 of 2 (build) STARTING...\n\n"
     comment_body += (
         "This comment was automatically generated given a benchmark was triggered.\n"
     )
@@ -38,7 +36,7 @@ def generate_build_started_pr_comment(
     comment_body += f"   - git branch: {git_branch}\n"
     comment_body += f"   - commit date and time: {commit_datetime}\n"
     comment_body += f"   - commit summary: {commit_summary}\n"
-    comment_body += f"   - test filters:\n"
+    comment_body += "   - test filters:\n"
     comment_body += (
         f"       - command priority lower limit: {tests_priority_lower_limit}\n"
     )
@@ -64,7 +62,7 @@ def generate_build_finished_pr_comment(
     build_duration_seconds,
 ):
     build_duration_seconds = int(build_duration_seconds)
-    comment_body = f"### CE Performance Automation : step 1 of 2 (build) DONE.\n\n"
+    comment_body = "### CE Performance Automation : step 1 of 2 (build) DONE.\n\n"
     comment_body += (
         "This comment was automatically generated given a benchmark was triggered.\n"
     )
@@ -76,7 +74,7 @@ def generate_build_finished_pr_comment(
     comment_body += f"   - git branch: {git_branch}\n"
     comment_body += f"   - commit date and time: {commit_datetime}\n"
     comment_body += f"   - commit summary: {commit_summary}\n"
-    comment_body += f"   - test filters:\n"
+    comment_body += "   - test filters:\n"
     comment_body += (
         f"       - command priority lower limit: {tests_priority_lower_limit}\n"
     )
@@ -197,12 +195,10 @@ def update_comment_if_needed(
                 )
             )
         if user_input.lower() == "y" or auto_approve:
-            print("Updating comment {}".format(regression_comment.html_url))
-            regression_comment.edit(comment_body)
             html_url = regression_comment.html_url
-            print(
-                "Updated comment. Access it via {}".format(regression_comment.html_url)
-            )
+            print("Updating comment {}".format(html_url))
+            regression_comment.edit(comment_body)
+            print("Updated comment. Access it via {}".format(html_url))
 
 
 def check_benchmark_build_comment(comments):

redis_benchmarks_specification/__common__/runner.py

@@ -6,9 +6,12 @@ import re
 
 import redis
 from redisbench_admin.run.metrics import collect_redis_metrics
-from redisbench_admin.run.redistimeseries import timeseries_test_sucess_flow
 from redisbench_admin.run_remote.run_remote import export_redis_metrics
 
+from redis_benchmarks_specification.__common__.timeseries import (
+    timeseries_test_sucess_flow,
+)
+
 
 def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
     cmds = None
@@ -144,8 +147,11 @@ def exporter_datasink_common(
     tf_triggering_env,
     topology_spec_name,
     default_metrics=None,
+    git_hash=None,
 ):
-    logging.info("Using datapoint_time_ms: {}".format(datapoint_time_ms))
+    logging.info(
+        f"Using datapoint_time_ms: {datapoint_time_ms}. git_has={git_hash}, git_branch={git_branch}, git_version={git_version}"
+    )
     timeseries_test_sucess_flow(
         datasink_push_results_redistimeseries,
         git_version,
@@ -167,9 +173,15 @@ def exporter_datasink_common(
         metadata,
         build_variant_name,
         running_platform,
+        None,
+        git_hash,
     )
     logging.info("Collecting memory metrics")
-    (_, _, overall_end_time_metrics,) = collect_redis_metrics(
+    (
+        _,
+        _,
+        overall_end_time_metrics,
+    ) = collect_redis_metrics(
         redis_conns,
         ["memory"],
         {