restore timeout for stopping services

Author: Andrei Neagu

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_scheduler/services.py

@@ -90,11 +90,13 @@ async def stop_dynamic_service(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     dynamic_service_stop: DynamicServiceStop,
+    timeout_s: NonNegativeInt,
 ) -> None:
     result = await rabbitmq_rpc_client.request(
         DYNAMIC_SCHEDULER_RPC_NAMESPACE,
         _RPC_METHOD_NAME_ADAPTER.validate_python("stop_dynamic_service"),
         dynamic_service_stop=dynamic_service_stop,
+        timeout_s=timeout_s,
     )
     assert result is None  # nosec
 

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/routes_external_scheduler/_service.py

@@ -10,6 +10,7 @@
 )
 from settings_library.utils_service import DEFAULT_FASTAPI_PORT
 
+from ....core.settings import ApplicationSettings
 from ....services.rabbitmq import get_rabbitmq_rpc_client
 from ....services.service_tracker import get_tracked_service, remove_tracked_service
 from .._utils import get_parent_app, get_settings
@@ -114,6 +115,8 @@ async def service_stop(node_id: NodeID):
         ui.notify(f"Could not stop service {node_id}. Was not abel to find it")
         return
 
+    settings: ApplicationSettings = parent_app.state.settings
+
     assert service_model.user_id  #  nosec
     assert service_model.project_id  # nosec
 
@@ -126,6 +129,7 @@ async def service_stop(node_id: NodeID):
             simcore_user_agent="",
             save_state=True,
         ),
+        timeout_s=int(settings.DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT.total_seconds()),
     )
 
 

services/dynamic-scheduler/tests/unit/api_rpc/test_api_rpc__services.py

@@ -432,7 +432,9 @@ def _get_rpc_stop(with_node_id: NodeID) -> DynamicServiceStop:
 
     # service was stopped
     result = await services.stop_dynamic_service(
-        rpc_client, dynamic_service_stop=_get_rpc_stop(node_id)
+        rpc_client,
+        dynamic_service_stop=_get_rpc_stop(node_id),
+        timeout_s=5,
     )
     assert result is None
 
@@ -441,12 +443,15 @@ def _get_rpc_stop(with_node_id: NodeID) -> DynamicServiceStop:
         await services.stop_dynamic_service(
             rpc_client,
             dynamic_service_stop=_get_rpc_stop(node_id_not_found),
+            timeout_s=5,
         )
 
     # service awaits for manual intervention
     with pytest.raises(ServiceWaitingForManualInterventionError):
         await services.stop_dynamic_service(
-            rpc_client, dynamic_service_stop=_get_rpc_stop(node_id_manual_intervention)
+            rpc_client,
+            dynamic_service_stop=_get_rpc_stop(node_id_manual_intervention),
+            timeout_s=5,
         )
 
 
@@ -486,6 +491,7 @@ async def test_stop_dynamic_service_serializes_generic_errors(
                 simcore_user_agent=simcore_user_agent,
                 save_state=save_state,
             ),
+            timeout_s=5,
         )