Skip to content

Commit 00f1a5d

Browse files
authored
Merge branch 'master' into fix-e2e-test-tip-2
2 parents 91f3d78 + a4e0406 commit 00f1a5d

File tree

1 file changed

+6
-2
lines changed
  • services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from servicelib.logging_utils import log_context
2828
from servicelib.rabbitmq import RabbitMQClient
2929
from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
30+
from servicelib.rabbitmq._errors import RemoteMethodNotRegisteredError
3031
from servicelib.rabbitmq.rpc_interfaces.agent.containers import force_container_cleanup
3132
from servicelib.rabbitmq.rpc_interfaces.agent.errors import (
3233
NoServiceVolumesFoundRPCError,
@@ -253,8 +254,11 @@ async def service_remove_sidecar_proxy_docker_networks_and_volumes(
253254
swarm_stack_name=swarm_stack_name,
254255
node_id=scheduler_data.node_uuid,
255256
)
256-
except NoServiceVolumesFoundRPCError as e:
257-
_logger.info("Could not remove volumes, reason: %s", e)
257+
except (
258+
NoServiceVolumesFoundRPCError,
259+
RemoteMethodNotRegisteredError, # happens when autoscaling node was removed
260+
) as e:
261+
_logger.info("Could not remove volumes, because: '%s'", e)
258262

259263
_logger.debug(
260264
"Removed dynamic-sidecar services and crated container for '%s'",

0 commit comments

Comments
 (0)