fix download image

Signed-off-by: SdgJlbl <sarah.diot-girard@owkin.com>
Substra · Aug 16, 2023 · 78685ff · 78685ff
1 parent 2785c44
commit 78685ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/backend/substrapp/compute_tasks/image_builder.py b/backend/substrapp/compute_tasks/image_builder.py
@@ -47,8 +47,9 @@ def wait_for_image_built(function: orchestrator.Function, channel: str) -> None:
             f"Initial function URI {function.function_address.uri}; "
             f"modified URI{function.function_address.uri.replace('file', 'image')}"
         )
+        # TODO remove hard-coded values
         attempt = 0
-        max_attempts = 10
+        max_attempts = 60
         while attempt < max_attempts:
             try:
                 function_image_content = organization_client.get(
@@ -58,15 +59,20 @@ def wait_for_image_built(function: orchestrator.Function, channel: str) -> None:
                     url=function.function_address.uri.replace("file", "image"),
                     checksum=None,
                 )
+                break
             except OrganizationHttpError:
                 attempt += 1
                 time.sleep(5)
+        else:
+            raise exceptions.PodTimeoutError(
+                f"Build for function {function.key} on backend {function.owner} didn't complete after 300 seconds"
+            )
 
-            os.makedirs(SUBTUPLE_TMP_DIR, exist_ok=True)
-            with TemporaryDirectory(dir=SUBTUPLE_TMP_DIR) as tmp_dir:
-                storage_path = pathlib.Path(tmp_dir) / f"{container_image_tag}.zip"
-                storage_path.write_bytes(function_image_content)
-                push_payload(storage_path, registry=REGISTRY, secure=False)
+        os.makedirs(SUBTUPLE_TMP_DIR, exist_ok=True)
+        with TemporaryDirectory(dir=SUBTUPLE_TMP_DIR) as tmp_dir:
+            storage_path = pathlib.Path(tmp_dir) / f"{container_image_tag}.zip"
+            storage_path.write_bytes(function_image_content)
+            push_payload(storage_path, registry=REGISTRY, secure=False)
 
             #
             # if exc.status_code == 404:

diff --git a/backend/substrapp/events/reactor.py b/backend/substrapp/events/reactor.py
@@ -105,7 +105,7 @@ def on_function_event(payload):
             )
 
         else:
-            logger.debug("Function not belonging to this organization, skipping building", asset_key=function.key)
+            logger.debug("Function not belonging to this organization, skipping building", asset_key=orc_function.key)
 
 
 def on_model_event(payload):