redisbench-admin 0.11.58__tar.gz → 0.11.60__tar.gz

{redisbench_admin-0.11.58 → redisbench_admin-0.11.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.58
+Version: 0.11.60
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 License-File: LICENSE
 Author: filipecosta90

{redisbench_admin-0.11.58 → redisbench_admin-0.11.60}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.58"
+version = "0.11.60"
 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.58 → redisbench_admin-0.11.60}/redisbench_admin/run/args.py

@@ -38,6 +38,7 @@ GIT_BRANCH = os.getenv("GIT_BRANCH", None)
 GIT_REPO = os.getenv("GIT_REPO", None)
 PROFILERS_ENABLED = bool(int(os.getenv("PROFILE", 0)))
 COMMANDSTATS_ENABLED = bool(int(os.getenv("COMMANDSTATS_ENABLED", 1)))
+SEARCH_MEMORY_ENABLED = bool(int(os.getenv("SEARCH_MEMORY_ENABLED", 0)))
 PROFILERS = os.getenv("PROFILERS", PROFILERS_DEFAULT)
 MAX_PROFILERS_PER_TYPE = int(os.getenv("MAX_PROFILERS", 1))
 PROFILE_FREQ = os.getenv("PROFILE_FREQ", PROFILE_FREQ_DEFAULT)
@@ -202,6 +203,12 @@ def common_run_args(parser):
         default=COMMANDSTATS_ENABLED,
         help="Enables commandstats collection.",
     )
+    parser.add_argument(
+        "--collect_search_memory",
+        type=bool,
+        default=SEARCH_MEMORY_ENABLED,
+        help="Enables search memory collection.",
+    )
     parser.add_argument(
         "--allowed-envs",
         type=str,

{redisbench_admin-0.11.58 → redisbench_admin-0.11.60}/redisbench_admin/run_remote/run_remote.py

@@ -108,6 +108,7 @@ def run_remote_command_logic(args, project_name, project_version):
     tf_github_branch = args.github_branch
     required_modules = args.required_module
     collect_commandstats = args.collect_commandstats
+    collect_search_memory = args.collect_search_memory
 
     (
         tf_github_actor,
@@ -987,6 +988,32 @@ def run_remote_command_logic(args, project_name, project_version):
                                                     },
                                                     expire_ms,
                                                 )
+                                                if collect_search_memory:
+                                                    (
+                                                        end_time_ms,
+                                                        _,
+                                                        overall_search_memory_metrics,
+                                                    ) = collect_redis_metrics(
+                                                        redis_conns, ["search_memory"]
+                                                    )
+                                                    export_redis_metrics(
+                                                        artifact_version,
+                                                        end_time_ms,
+                                                        overall_search_memory_metrics,
+                                                        rts,
+                                                        setup_name,
+                                                        setup_type,
+                                                        test_name,
+                                                        tf_github_branch,
+                                                        tf_github_org,
+                                                        tf_github_repo,
+                                                        tf_triggering_env,
+                                                        {
+                                                            "metric-type": "search-memory",
+                                                            "arch": architecture,
+                                                        },
+                                                        expire_ms,
+                                                    )
                                                 if collect_commandstats:
                                                     (
                                                         end_time_ms,

{redisbench_admin-0.11.58 → redisbench_admin-0.11.60}/redisbench_admin/utils/remote.py

@@ -498,13 +498,24 @@ def validate_result_expectations(
 
 
 def check_and_fix_pem_str(ec2_private_pem: str):
-    pem_str = ec2_private_pem.replace("-----BEGIN RSA PRIVATE KEY-----", "")
-    pem_str = pem_str.replace("-----END RSA PRIVATE KEY-----", "")
-    pem_str = pem_str.replace(" ", "\n")
-    pem_str = "-----BEGIN RSA PRIVATE KEY-----\n" + pem_str
-    pem_str = pem_str + "-----END RSA PRIVATE KEY-----\n"
-    # remove any dangling whitespace
+    if "RSA" in ec2_private_pem:
+        print("Detected RSA private key")
+        pem_str = ec2_private_pem.replace("-----BEGIN RSA PRIVATE KEY-----", "")
+        pem_str = pem_str.replace("-----END RSA PRIVATE KEY-----", "")
+        pem_str = pem_str.replace(" ", "\n")
+        pem_str = "-----BEGIN RSA PRIVATE KEY-----\n" + pem_str
+        pem_str = pem_str + "-----END RSA PRIVATE KEY-----\n"
+    if "OPENSSH" in ec2_private_pem:
+        print("Detected OPENSSH private key")
+        pem_str = ec2_private_pem.replace("-----BEGIN OPENSSH PRIVATE KEY-----", "")
+        pem_str = pem_str.replace("-----END OPENSSH PRIVATE KEY-----", "")
+        pem_str = pem_str.replace(" ", "\n")
+        pem_str = "-----BEGIN OPENSSH PRIVATE KEY-----\n" + pem_str
+        pem_str = pem_str + "-----END OPENSSH PRIVATE KEY-----\n"
+        # remove any dangling whitespace
     pem_str = os.linesep.join([s for s in pem_str.splitlines() if s])
+    # add a final newline
+    pem_str = pem_str + "\n"
     return pem_str