redisbench-admin 0.11.31__tar.gz → 0.11.33__tar.gz

{redisbench_admin-0.11.31 → redisbench_admin-0.11.33}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.31"
+version = "0.11.33"
 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.31 → redisbench_admin-0.11.33}/redisbench_admin/run/metrics.py

@@ -5,7 +5,7 @@
 #
 import logging
 import datetime as dt
-
+import redis
 from jsonpath_ng import parse
 
 
@@ -99,28 +99,33 @@ def collect_redis_metrics(
     for conn_n, conn in enumerate(redis_conns):
         conn_res = {}
         for section in sections:
-            info = conn.info(section)
-            conn_res[section] = info
-            if section not in overall:
-                overall[section] = {}
-            for k, v in info.items():
-                collect = True
-                if section_filter is not None:
-                    if section in section_filter:
-                        if k not in section_filter[section]:
-                            collect = False
-                if collect and type(v) is float or type(v) is int:
-                    if k not in overall[section]:
-                        overall[section][k] = 0
-                    overall[section][k] += v
-                if collect and type(v) is dict:
-                    for inner_k, inner_v in v.items():
-                        if type(inner_v) is float or type(inner_v) is int:
-                            final_str_k = "{}_{}".format(k, inner_k)
-                            if multi_shard:
-                                final_str_k += "_shard_{}".format(conn_n + 1)
-                            if final_str_k not in overall[section]:
-                                overall[section][final_str_k] = inner_v
+            try:
+                info = conn.info(section)
+                conn_res[section] = info
+                if section not in overall:
+                    overall[section] = {}
+                for k, v in info.items():
+                    collect = True
+                    if section_filter is not None:
+                        if section in section_filter:
+                            if k not in section_filter[section]:
+                                collect = False
+                    if collect and type(v) is float or type(v) is int:
+                        if k not in overall[section]:
+                            overall[section][k] = 0
+                        overall[section][k] += v
+                    if collect and type(v) is dict:
+                        for inner_k, inner_v in v.items():
+                            if type(inner_v) is float or type(inner_v) is int:
+                                final_str_k = "{}_{}".format(k, inner_k)
+                                if multi_shard:
+                                    final_str_k += "_shard_{}".format(conn_n + 1)
+                                if final_str_k not in overall[section]:
+                                    overall[section][final_str_k] = inner_v
+            except redis.exceptions.ConnectionError as e:
+                logging.warning(
+                    f"Unable to collect section {section} from redis. error: {e.__str__}"
+                )
 
         res.append(conn_res)
 

{redisbench_admin-0.11.31 → redisbench_admin-0.11.33}/redisbench_admin/run/run.py

@@ -86,7 +86,7 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
             setup_contains_dbconfig = False
             if "dbconfig" in setup_settings:
                 setup_contains_dbconfig = True
-            logging.info(
+            logging.debug(
                 f"setup ({setup_name}): {setup_settings}. contains dbconfig {setup_contains_dbconfig}"
             )
 

{redisbench_admin-0.11.31 → redisbench_admin-0.11.33}/redisbench_admin/run_remote/run_remote.py

@@ -276,6 +276,7 @@ def run_remote_command_logic(args, project_name, project_version):
             host=args.redistimeseries_host,
             port=args.redistimeseries_port,
             password=args.redistimeseries_pass,
+            retry_on_timeout=True,
         )
         rts.ping()
 

{redisbench_admin-0.11.31 → redisbench_admin-0.11.33}/redisbench_admin/watchdog/watchdog.py

@@ -153,6 +153,7 @@ def watchdog_command_logic(args, project_name, project_version):
         host=args.redistimeseries_host,
         port=args.redistimeseries_port,
         password=args.redistimeseries_pass,
+        retry_on_timeout=True,
     )
     rts.ping()
     ec2_client = boto3.client("ec2")