Skip to content

Commit 407850d

Browse files
author
Andrei Neagu
committed
reverted changes
1 parent b4e7c1b commit 407850d

File tree

8 files changed

+1
-224
lines changed

8 files changed

+1
-224
lines changed

β€Žpackages/service-library/src/servicelib/long_running_tasks/task.pyβ€Ž

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,7 @@ async def setup(self) -> None:
206206
)
207207
await self._started_event_task_tasks_monitor.wait()
208208

209-
async def remove_local_running_tasks(self) -> None:
210-
"""
211-
NOTE: background `_task_cancelled_tasks_removal` will be shutdown by this function
212-
only invoke this externally before shutting down the process to ensure
213-
proper cleanup of local tasks fron Redis (e.g. before closing a dynamic sidecar)
214-
"""
209+
async def teardown(self) -> None:
215210
# stop cancelled_tasks_removal
216211
if self._task_cancelled_tasks_removal:
217212
await cancel_wait_task(self._task_cancelled_tasks_removal)
@@ -237,9 +232,6 @@ async def _remove_local_task(task_data: TaskData) -> None:
237232
limit=_PARALLEL_TASKS_CANCELLATION,
238233
)
239234

240-
async def teardown(self) -> None:
241-
await self.remove_local_running_tasks()
242-
243235
# stop stale_tasks_monitor
244236
if self._task_stale_tasks_monitor:
245237
await cancel_wait_task(

β€Žservices/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_public.pyβ€Ž

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -503,11 +503,6 @@ async def free_reserved_disk_space(
503503
) -> None:
504504
await self._thin_client.post_disk_reserved_free(dynamic_sidecar_endpoint)
505505

506-
async def cleanup_long_running_tasks(
507-
self, dynamic_sidecar_endpoint: AnyHttpUrl
508-
) -> None:
509-
await self._thin_client.delete_long_running_tasks(dynamic_sidecar_endpoint)
510-
511506

512507
def _get_proxy_configuration(
513508
entrypoint_container_name: str, service_port: PortInt

β€Žservices/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_thin.pyβ€Ž

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,3 @@ async def post_disk_reserved_free(
302302
) -> Response:
303303
url = self._get_url(dynamic_sidecar_endpoint, "disk/reserved:free")
304304
return await self.client.post(url)
305-
306-
@retry_on_errors()
307-
@expect_status(status.HTTP_204_NO_CONTENT)
308-
async def delete_long_running_tasks(
309-
self,
310-
dynamic_sidecar_endpoint: AnyHttpUrl,
311-
) -> Response:
312-
url = self._get_url(dynamic_sidecar_endpoint, "long-running-tasks")
313-
return await self.client.delete(url)

β€Žservices/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/long_running_tasks.pyβ€Ž

Lines changed: 0 additions & 19 deletions
This file was deleted.

β€Žservices/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/_long_running_tasks.pyβ€Ž

Lines changed: 0 additions & 11 deletions
This file was deleted.

β€Žservices/dynamic-sidecar/src/simcore_service_dynamic_sidecar/services/long_running_tasks.pyβ€Ž

Lines changed: 0 additions & 9 deletions
This file was deleted.

β€Žservices/dynamic-sidecar/tests/unit/api/rest/test_long_running_tasks.pyβ€Ž

Lines changed: 0 additions & 78 deletions
This file was deleted.

β€Žservices/dynamic-sidecar/tests/unit/api/rpc/test__long_running_tasks.pyβ€Ž

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
Β (0)