Fixed total shards cpu usage computation when shard info is not present (#316)

* Fixed total shards cpu usage computation when shard info is not present

* Bumping version from 0.7.13 to 0.7.14

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.7.13"
+version = "0.7.14"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/run/ann/pkg

@@ -135,17 +135,23 @@ def from_info_to_overall_shard_cpu(benchmark_cpu_stats):
     total_avg_cpu_pct = 0.0
     res = {}
     for shard_n, cpu_stats_arr in benchmark_cpu_stats.items():
+        avg_cpu_pct = None
         # we need at least 2 elements to compute the cpu usage
-        if len(cpu_stats_arr) < 2:
-            avg_cpu_pct = None
-        else:
-            start_ts_micros = cpu_stats_arr[0]["server_time_usec"]
-            start_total_cpu = get_total_cpu(cpu_stats_arr[0])
-            end_ts_micros = cpu_stats_arr[len(cpu_stats_arr) - 1]["server_time_usec"]
-            end_total_cpu = get_total_cpu(cpu_stats_arr[len(cpu_stats_arr) - 1])
-            total_secs = (end_ts_micros - start_ts_micros) / 1000000
-            total_cpu_usage = end_total_cpu - start_total_cpu
-            avg_cpu_pct = 100.0 * (total_cpu_usage / total_secs)
+        if len(cpu_stats_arr) >= 2:
+            stats_start_pos = cpu_stats_arr[0]
+            stats_end_pos = cpu_stats_arr[len(cpu_stats_arr) - 1]
+            if (
+                "server_time_usec" in stats_end_pos
+                and "server_time_usec" in stats_start_pos
+            ):
+                start_ts_micros = stats_start_pos["server_time_usec"]
+                end_ts_micros = stats_end_pos["server_time_usec"]
+                start_total_cpu = get_total_cpu(stats_start_pos)
+                end_total_cpu = get_total_cpu(stats_end_pos)
+                total_secs = (end_ts_micros - start_ts_micros) / 1000000
+                total_cpu_usage = end_total_cpu - start_total_cpu
+                avg_cpu_pct = 100.0 * (total_cpu_usage / total_secs)
+
         res[shard_n] = avg_cpu_pct
         if avg_cpu_pct is not None:
             total_avg_cpu_pct += avg_cpu_pct

redisbench_admin/run/metrics.py

@@ -566,10 +566,16 @@ def run_remote_command_logic(args, project_name, project_version):
                                     ) = from_info_to_overall_shard_cpu(
                                         redisbench_admin.run.metrics.BENCHMARK_CPU_STATS_GLOBAL
                                     )
-                                    logging.info(
-                                        "Total CPU usage ({:.3f} %)".format(
+                                    if total_shards_cpu_usage is None:
+                                        total_shards_cpu_usage_str = "n/a"
+                                    else:
+                                        total_shards_cpu_usage_str = "{:.3f}".format(
                                             total_shards_cpu_usage
                                         )
+                                    logging.info(
+                                        "Total CPU usage ({} %)".format(
+                                            total_shards_cpu_usage_str
+                                        )
                                     )
 
                                     if remote_run_result is False:
@@ -610,9 +616,10 @@ def run_remote_command_logic(args, project_name, project_version):
                                                     ]
                                                 },
                                             )
-                                            overall_end_time_metrics[
-                                                "total_shards_used_cpu_pct"
-                                            ] = total_shards_cpu_usage
+                                            if total_shards_cpu_usage is not None:
+                                                overall_end_time_metrics[
+                                                    "total_shards_used_cpu_pct"
+                                                ] = total_shards_cpu_usage
                                             expire_ms = 7 * 24 * 60 * 60 * 1000
                                             export_redis_metrics(
                                                 artifact_version,