added total attempts count as well

Author: Andrei Neagu

packages/service-library/src/servicelib/deferred_tasks/_base_deferred_handler.py

@@ -47,13 +47,17 @@ async def get_retries(cls, context: DeferredContext) -> NonNegativeInt:
 
     @classmethod
     async def get_retry_delay(
-        cls, context: DeferredContext, remaining_attempts: NonNegativeInt
+        cls,
+        context: DeferredContext,
+        remaining_attempts: NonNegativeInt,
+        total_attempts: NonNegativeInt,
     ) -> timedelta:
         """
         returns: the delay between eatch retry attempt (default: 0s)
         """
         assert context  # nosec
         assert remaining_attempts  # nosec
+        assert total_attempts  # nosec
         return timedelta(seconds=0)
 
     @classmethod

packages/service-library/src/servicelib/deferred_tasks/_deferred_manager.py

@@ -297,9 +297,11 @@ async def __start(
         subclass = self.__get_subclass(class_unique_reference)
         deferred_context = self.__get_deferred_context(start_context)
 
+        retry_count = await subclass.get_retries(deferred_context)
         task_schedule = TaskScheduleModel(
             timeout=await subclass.get_timeout(deferred_context),
-            execution_attempts=await subclass.get_retries(deferred_context) + 1,
+            total_attempts=retry_count,
+            execution_attempts=retry_count + 1,
             class_unique_reference=class_unique_reference,
             start_context=start_context,
             state=TaskState.SCHEDULED,
@@ -467,6 +469,7 @@ async def _fs_handle_error_result(  # pylint:disable=method-hidden
             sleep_interval = await subclass.get_retry_delay(
                 context=deferred_context,
                 remaining_attempts=task_schedule.execution_attempts,
+                total_attempts=task_schedule.total_attempts,
             )
             await asyncio.sleep(sleep_interval.total_seconds())
 

packages/service-library/src/servicelib/deferred_tasks/_task_schedule.py

@@ -39,6 +39,11 @@ class TaskScheduleModel(BaseModel):
         ..., description="represents the execution step of the task"
     )
 
+    total_attempts: NonNegativeInt = Field(
+        ...,
+        description="maximum number of attempts before giving up (0 means no retries)",
+    )
+
     execution_attempts: NonNegativeInt = Field(
         ...,
         description="remaining attempts to run the code, only retries if this is > 0",