2121from models_library .users import UserID
2222from servicelib .fastapi .http_client_thin import BaseHttpClientError
2323from servicelib .logging_utils import log_context
24- from servicelib .long_running_tasks .errors import GenericClientError
24+ from servicelib .long_running_tasks .errors import TaskExceptionError
2525from servicelib .long_running_tasks .models import ProgressCallback , TaskProgress
2626from servicelib .rabbitmq import RabbitMQClient
2727from servicelib .rabbitmq ._client_rpc import RabbitMQRPCClient
@@ -135,7 +135,7 @@ async def service_remove_containers(
135135 await sidecars_client .stop_service (
136136 scheduler_data .endpoint , progress_callback = progress_callback
137137 )
138- except (BaseHttpClientError , GenericClientError ) as e :
138+ except (BaseHttpClientError , TaskExceptionError ) as e :
139139 _logger .info (
140140 (
141141 "Could not remove service containers for %s. "
@@ -152,7 +152,7 @@ async def service_free_reserved_disk_space(
152152 scheduler_data : SchedulerData = _get_scheduler_data (app , node_id )
153153 try :
154154 await sidecars_client .free_reserved_disk_space (scheduler_data .endpoint )
155- except BaseHttpClientError as e :
155+ except ( BaseHttpClientError , TaskExceptionError ) as e :
156156 _logger .info (
157157 (
158158 "Could not remove service containers for %s. "
@@ -370,7 +370,7 @@ async def attempt_pod_removal_and_data_saving(
370370 scheduler_data .dynamic_sidecar .were_state_and_outputs_saved = True
371371
372372 _logger .info ("dynamic-sidecar saved: state and output ports" )
373- except (BaseHttpClientError , GenericClientError ) as e :
373+ except (BaseHttpClientError , TaskExceptionError ) as e :
374374 _logger .error ( # noqa: TRY400
375375 (
376376 "Could not contact dynamic-sidecar to save service "
0 commit comments