api: check version for start_rq

materialsproject · Sep 3, 2021 · bd717f6 · bd717f6
1 parent 78367cc
commit bd717f6
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py
@@ -28,11 +28,17 @@ def start(program):
     prefix = "com.amazonaws.ecs"
     cluster = labels[f"{prefix}.cluster"].split("/", 1)[1]
     family = labels[f"{prefix}.task-definition-family"]
-    version = labels[f"{prefix}.task-definition-version"]
-    tasks = client.list_tasks(cluster=cluster, family=family).get("taskArns", [])
-    print("TASKS", tasks)
-    # TODO check version of each task
-    start_rq = len(tasks) == 1  # this task included in metadata response
+    version = int(labels[f"{prefix}.task-definition-version"])
+    task_arns = client.list_tasks(cluster=cluster, family=family).get("taskArns", [])
+    tasks = client.describe_tasks(cluster=cluster, tasks=task_arns).get("tasks", [])
+    ntasks = 0
+
+    for task in tasks:
+        v = int(task["taskDefinitionArn"].rsplit(":", 1)[1])
+        ntasks += int(v == version)
+
+    start_rq = ntasks == 1  # this task included in metadata response
+    print(f"TASKS {ntasks}/{len(tasks)} -> START RQ {start_rq}")
 
 if start_rq:
     for program in ["worker", "scheduler"]: