if totalTaskTimeOut is 0 we shoudl return

conductor-oss · Nov 27, 2024 · e0174b6 · e0174b6
1 parent 79efa13
commit e0174b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/DeciderService.java b/core/src/main/java/com/netflix/conductor/core/execution/DeciderService.java
@@ -706,6 +706,7 @@ void checkTaskTimeout(TaskDef taskDef, TaskModel task) {
         }
         if (task.getStatus().isTerminal()
                 || taskDef.getTimeoutSeconds() <= 0
+                || taskDef.getTotalTimeoutSeconds() <= 0
                 || task.getStartTime() <= 0) {
             return;
         }

diff --git a/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java b/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java
@@ -498,6 +498,7 @@ public void testTaskTimeout() {
         taskType.setName("test");
         taskType.setTimeoutPolicy(TimeoutPolicy.RETRY);
         taskType.setTimeoutSeconds(1);
+        taskType.setTotalTimeoutSeconds(1_000);
 
         TaskModel task = new TaskModel();
         task.setTaskType(taskType.getName());