From 3c13eaa1592b5cf46d6aca8b3764aefc546eeff7 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Thu, 1 Jun 2023 22:03:42 +0200
Subject: [PATCH] Simplify get_dead_runners_in_ec2 a little bit, update runners

---
 tests/ci/ci_runners_metrics_lambda/app.py | 62 +++++++++++------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/tests/ci/ci_runners_metrics_lambda/app.py b/tests/ci/ci_runners_metrics_lambda/app.py
index d8b9489b1a7..9c38659269b 100644
--- a/tests/ci/ci_runners_metrics_lambda/app.py
+++ b/tests/ci/ci_runners_metrics_lambda/app.py
@@ -99,44 +99,44 @@ def get_dead_runners_in_ec2(runners: RunnerDescriptions) -> RunnerDescriptions:
 def get_lost_ec2_instances(runners: RunnerDescriptions) -> List[dict]:
     client = boto3.client("ec2")
     reservations = client.describe_instances(
-        Filters=[{"Name": "tag-key", "Values": ["github:runner-type"]}]
+        Filters=[{"Name": "tag-key", "Values": ["github:runner-type"]}],
     )["Reservations"]
-    lost_instances = []
-    offline_runners = [
-        runner.name for runner in runners if runner.offline and not runner.busy
+    # flatten the reservation into instances
+    instances = [
+        instance
+        for reservation in reservations
+        for instance in reservation["Instances"]
     ]
-    # Here we refresh the runners to get the most recent state
+    lost_instances = []
+    offline_runner_names = {
+        runner.name for runner in runners if runner.offline and not runner.busy
+    }
+    runner_names = {runner.name for runner in runners}
     now = datetime.now().timestamp()
 
-    for reservation in reservations:
-        for instance in reservation["Instances"]:
-            # Do not consider instances started 20 minutes ago as problematic
-            if now - instance["LaunchTime"].timestamp() < 1200:
-                continue
+    for instance in instances:
+        # Do not consider instances started 20 minutes ago as problematic
+        if now - instance["LaunchTime"].timestamp() < 1200:
+            continue
 
-            runner_type = [
-                tag["Value"]
-                for tag in instance["Tags"]
-                if tag["Key"] == "github:runner-type"
-            ][0]
-            # If there's no necessary labels in runner type it's fine
-            if not (
-                UNIVERSAL_LABEL in runner_type or runner_type in RUNNER_TYPE_LABELS
-            ):
-                continue
+        runner_type = [
+            tag["Value"]
+            for tag in instance["Tags"]
+            if tag["Key"] == "github:runner-type"
+        ][0]
+        # If there's no necessary labels in runner type it's fine
+        if not (UNIVERSAL_LABEL in runner_type or runner_type in RUNNER_TYPE_LABELS):
+            continue
 
-            if instance["InstanceId"] in offline_runners:
-                lost_instances.append(instance)
-                continue
+        if instance["InstanceId"] in offline_runner_names:
+            lost_instances.append(instance)
+            continue
 
-            if instance["State"]["Name"] == "running" and (
-                not [
-                    runner
-                    for runner in runners
-                    if runner.name == instance["InstanceId"]
-                ]
-            ):
-                lost_instances.append(instance)
+        if (
+            instance["State"]["Name"] == "running"
+            and not instance["InstanceId"] in runner_names
+        ):
+            lost_instances.append(instance)
 
     return lost_instances