reverted changes

Author: Andrei Neagu

packages/service-library/src/servicelib/long_running_tasks/_lrt_client.py

@@ -22,9 +22,6 @@
 
 _logger = logging.getLogger(__name__)
 
-_RPC_MAX_CANCELLATION_TIMEOUT: Final[PositiveInt] = int(
-    timedelta(hours=1).total_seconds()
-)
 _RPC_TIMEOUT_SHORT_REQUESTS: Final[PositiveInt] = int(
     timedelta(seconds=20).total_seconds()
 )
@@ -141,14 +138,14 @@ async def remove_task(
     cancellation_timeout: timedelta | None,
 ) -> None:
     timeout_s = (
-        _RPC_MAX_CANCELLATION_TIMEOUT
+        None
         if cancellation_timeout is None
         else int(cancellation_timeout.total_seconds())
     )
 
     # NOTE: task always gets cancelled even if not waiting for it
     # request will return immediatlye, no need to wait so much
-    if not wait_for_removal:
+    if wait_for_removal is False:
         timeout_s = _RPC_TIMEOUT_SHORT_REQUESTS
 
     result = await rabbitmq_rpc_client.request(

packages/service-library/src/servicelib/long_running_tasks/lrt_api.py

@@ -109,16 +109,7 @@ async def remove_task(
 ) -> None:
     """cancels and removes a task
 
-    Arguments:
-        wait_for_removal -- if True, then it will wait for the task to be removed
-            before returning otherwise returns immediately
-
-    Keyword Arguments:
-        cancellation_timeout (default: {None}) -- if specified it's the amount of
-            time to wait before cancellation is timedout
-            if not specified and:
-             - wait_for_removal is True, it's set to _RPC_TIMEOUT_SHORT_REQUESTS
-             - wait_for_removal is False it's set to _RPC_MAX_CANCELLATION_TIMEOUT
+    When `wait_for_removal` is True, `cancellationt_timeout` is set to _RPC_TIMEOUT_SHORT_REQUESTS
     """
     await _lrt_client.remove_task(
         rabbitmq_rpc_client,

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py

@@ -194,18 +194,10 @@ async def test_cancel_task(
     assert not data
     assert not error
 
-    # it should eventually go away, so no status
-    # does not wait for removal any longer
-    async for attempt in AsyncRetrying(
-        wait=wait_fixed(0.1),
-        stop=stop_after_delay(5),
-        reraise=True,
-        retry=retry_if_exception_type(AssertionError),
-    ):
-        with attempt:
-            status_url = client.app.router["get_task_status"].url_for(task_id=task_id)
-            result = await client.get(f"{status_url}")
-            await assert_status(result, status.HTTP_404_NOT_FOUND)
+    # it should be gone, so no status
+    status_url = client.app.router["get_task_status"].url_for(task_id=task_id)
+    result = await client.get(f"{status_url}")
+    await assert_status(result, status.HTTP_404_NOT_FOUND)
     # and also no results
     result_url = client.app.router["get_task_result"].url_for(task_id=task_id)
     result = await client.get(f"{result_url}")

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py

@@ -17,12 +17,6 @@
 from servicelib.aiohttp.rest_middlewares import append_rest_middlewares
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisSettings
-from tenacity import (
-    AsyncRetrying,
-    retry_if_exception_type,
-    stop_after_delay,
-    wait_fixed,
-)
 from yarl import URL
 
 pytest_simcore_core_services_selection = [
@@ -118,20 +112,12 @@ async def test_long_running_task_request_timeout(
         ):
             print(f"<-- received {task=}")
 
-    # does not wait for removal any longer
-    async for attempt in AsyncRetrying(
-        wait=wait_fixed(0.1),
-        stop=stop_after_delay(5),
-        reraise=True,
-        retry=retry_if_exception_type(AssertionError),
-    ):
-        with attempt:
-            # check the task was properly aborted by the client
-            list_url = client.app.router["list_tasks"].url_for()
-            result = await client.get(f"{list_url}")
-            data, error = await assert_status(result, status.HTTP_200_OK)
-            assert not error
-            assert data == []
+    # check the task was properly aborted by the client
+    list_url = client.app.router["list_tasks"].url_for()
+    result = await client.get(f"{list_url}")
+    data, error = await assert_status(result, status.HTTP_200_OK)
+    assert not error
+    assert data == []
 
 
 async def test_long_running_task_request_error(

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py

@@ -29,10 +29,6 @@
 from servicelib.long_running_tasks.task import TaskContext
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisSettings
-from tenacity.asyncio import AsyncRetrying
-from tenacity.retry import retry_if_exception_type
-from tenacity.stop import stop_after_delay
-from tenacity.wait import wait_fixed
 
 pytest_simcore_core_services_selection = [
     "rabbit",
@@ -180,31 +176,15 @@ async def test_cancel_task(
         task_id=task_id
     )
     # calling cancel without task context should find nothing
-    # no longer waits for removal to end
-    async for attempt in AsyncRetrying(
-        wait=wait_fixed(0.1),
-        stop=stop_after_delay(5),
-        reraise=True,
-        retry=retry_if_exception_type(AssertionError),
-    ):
-        with attempt:
-            resp = await client_with_task_context.delete(f"{cancel_url}")
-            await assert_status(resp, status.HTTP_404_NOT_FOUND)
+    resp = await client_with_task_context.delete(f"{cancel_url}")
+    await assert_status(resp, status.HTTP_404_NOT_FOUND)
     # calling with context should find and delete the task
     resp = await client_with_task_context.delete(
         f"{cancel_url.update_query(task_context)}"
     )
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
     # calling with context a second time should find nothing
-    # no longer waits for removal to end
-    async for attempt in AsyncRetrying(
-        wait=wait_fixed(0.1),
-        stop=stop_after_delay(5),
-        reraise=True,
-        retry=retry_if_exception_type(AssertionError),
-    ):
-        with attempt:
-            resp = await client_with_task_context.delete(
-                f"{cancel_url.update_query(task_context)}"
-            )
-            await assert_status(resp, status.HTTP_404_NOT_FOUND)
+    resp = await client_with_task_context.delete(
+        f"{cancel_url.update_query(task_context)}"
+    )
+    await assert_status(resp, status.HTTP_404_NOT_FOUND)