|
28 | 28 | from servicelib.logging_utils import log_context |
29 | 29 | from servicelib.rabbitmq import RabbitMQClient |
30 | 30 | from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient |
| 31 | +from servicelib.rabbitmq.rpc_interfaces.agent.errors import ( |
| 32 | + NoServiceVolumesFoundRPCError, |
| 33 | +) |
31 | 34 | from servicelib.rabbitmq.rpc_interfaces.agent.volumes import ( |
32 | 35 | remove_volumes_without_backup_for_service, |
33 | 36 | ) |
@@ -234,12 +237,15 @@ async def service_remove_sidecar_proxy_docker_networks_and_volumes( |
234 | 237 | ) |
235 | 238 | with log_context(_logger, logging.DEBUG, f"removing volumes '{node_uuid}'"): |
236 | 239 | rabbit_rpc_client: RabbitMQRPCClient = app.state.rabbitmq_rpc_client |
237 | | - await remove_volumes_without_backup_for_service( |
238 | | - rabbit_rpc_client, |
239 | | - docker_node_id=scheduler_data.dynamic_sidecar.docker_node_id, |
240 | | - swarm_stack_name=swarm_stack_name, |
241 | | - node_id=scheduler_data.node_uuid, |
242 | | - ) |
| 240 | + try: |
| 241 | + await remove_volumes_without_backup_for_service( |
| 242 | + rabbit_rpc_client, |
| 243 | + docker_node_id=scheduler_data.dynamic_sidecar.docker_node_id, |
| 244 | + swarm_stack_name=swarm_stack_name, |
| 245 | + node_id=scheduler_data.node_uuid, |
| 246 | + ) |
| 247 | + except NoServiceVolumesFoundRPCError as e: |
| 248 | + _logger.info("Could not remove volumes, reason: %s", e) |
243 | 249 |
|
244 | 250 | _logger.debug( |
245 | 251 | "Removed dynamic-sidecar services and crated container for '%s'", |
|
0 commit comments