🐛 Various fixes (ITISFoundation#3314)

* logs recovery does not work on swarm

* messages out of context would fail

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_api/_volume.py

@@ -115,15 +115,8 @@ async def remove_volumes_from_node(
                         task_state == "complete"
                         and task_status["ContainerStatus"]["ExitCode"] == 0
                     ):
-                        # recover logs from command for a simpler debugging
-                        container_id = task_status["ContainerStatus"]["ContainerID"]
-                        container = await client.containers.get(container_id)
-                        container_logs = await container.log(stdout=True, stderr=True)
                         log.error(
-                            "Service %s, %s output: %s",
-                            service_id,
-                            f"{task_status=}",
-                            "\n".join(container_logs),
+                            "Service %s status: %s", service_id, f"{task_status=}"
                         )
                         # NOTE: above implies the volumes will remain in the system and
                         # have to be manually removed.

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/nodeports.py

@@ -145,10 +145,10 @@ async def upload_outputs(
             await logged_gather(*archiving_tasks)
         await PORTS.set_multiple(ports_values)
 
-    elapsed_time = time.perf_counter() - start_time
-    total_bytes = sum(_get_size_of_value(x) for x in ports_values.values())
-    logger.info("Uploaded %s bytes in %s seconds", total_bytes, elapsed_time)
-    logger.debug(_CONTROL_TESTMARK_DY_SIDECAR_NODEPORT_UPLOADED_MESSAGE)
+        elapsed_time = time.perf_counter() - start_time
+        total_bytes = sum(_get_size_of_value(x) for x in ports_values.values())
+        logger.info("Uploaded %s bytes in %s seconds", total_bytes, elapsed_time)
+        logger.debug(_CONTROL_TESTMARK_DY_SIDECAR_NODEPORT_UPLOADED_MESSAGE)
 
 
 async def dispatch_update_for_directory(