delegate volume removal to agent

Author: Andrei Neagu

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_utils.py

@@ -67,11 +67,10 @@
     get_projects_networks_containers,
     remove_dynamic_sidecar_network,
     remove_dynamic_sidecar_stack,
-    remove_volumes_from_node,
     try_to_remove_network,
 )
 from ...errors import EntrypointContainerNotFoundError
-from ...volumes import DY_SIDECAR_SHARED_STORE_PATH, DynamicSidecarVolumesPathsResolver
+from ...volumes_removal import remove_volumes_from_node
 
 if TYPE_CHECKING:
     # NOTE: TYPE_CHECKING is True when static type checkers are running,
@@ -230,29 +229,13 @@ async def service_remove_sidecar_proxy_docker_networks_and_volumes(
             task_progress.update(
                 message="removing volumes", percent=ProgressPercent(0.3)
             )
-            unique_volume_names = [
-                DynamicSidecarVolumesPathsResolver.source(
-                    path=volume_path,
-                    node_uuid=scheduler_data.node_uuid,
-                    run_id=scheduler_data.run_id,
-                )
-                for volume_path in [
-                    DY_SIDECAR_SHARED_STORE_PATH,
-                    scheduler_data.paths_mapping.inputs_path,
-                    scheduler_data.paths_mapping.outputs_path,
-                    *scheduler_data.paths_mapping.state_paths,
-                ]
-            ]
-            with log_context(
-                _logger, logging.DEBUG, f"removing volumes via service for {node_uuid}"
-            ):
+            with log_context(_logger, logging.DEBUG, f"removing volumes '{node_uuid}'"):
+                rabbitmq_client: RabbitMQClient = app.state.rabbitmq_client
                 await remove_volumes_from_node(
-                    swarm_stack_name=swarm_stack_name,
-                    volume_names=unique_volume_names,
+                    rabbitmq_client=rabbitmq_client,
                     docker_node_id=scheduler_data.dynamic_sidecar.docker_node_id,
-                    user_id=scheduler_data.user_id,
-                    project_id=scheduler_data.project_id,
-                    node_uuid=scheduler_data.node_uuid,
+                    swarm_stack_name=swarm_stack_name,
+                    node_id=scheduler_data.node_uuid,
                 )
 
     _logger.debug(

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/volumes_removal.py

@@ -0,0 +1,22 @@
+from models_library.projects_nodes_io import NodeID
+from servicelib.rabbitmq import RabbitMQClient
+from servicelib.rabbitmq.rpc_interfaces.agent.volumes import (
+    remove_volumes_without_backup_for_service,
+)
+
+
+async def remove_volumes_from_node(
+    rabbitmq_client: RabbitMQClient,
+    docker_node_id: str,
+    swarm_stack_name: str,
+    *,
+    node_id: NodeID,
+) -> None:
+    """removes all service volumes form the node where it was running"""
+
+    await remove_volumes_without_backup_for_service(
+        rabbitmq_client,
+        docker_node_id=docker_node_id,
+        swarm_stack_name=swarm_stack_name,
+        node_id=node_id,
+    )