changes in task timeout

conductor-oss · Nov 29, 2024 · d88f973 · d88f973
1 parent ba2766d
commit d88f973
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 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
@@ -719,8 +719,16 @@ void checkTaskTimeout(TaskDef taskDef, TaskModel task) {
         long elapsedTimeFromFirstTaskExecution =
                 now - (task.getFirstStartTime() + ((long) task.getStartDelayInSeconds() * 1000L));
 
-        if (elapsedTimeFromFirstTaskExecution < totalTaskTimeout && elapsedTime < timeout) {
-            return;
+        if (totalTaskTimeout > 0) {
+            // If totalTaskTimeout is greater than 0, check both conditions
+            if (elapsedTimeFromFirstTaskExecution < totalTaskTimeout && elapsedTime < timeout) {
+                return;
+            }
+        } else {
+            // If totalTaskTimeout is not greater than 0, only check the timeout condition
+            if (elapsedTime < timeout) {
+                return;
+            }
         }
 
         String reason =

diff --git a/test-harness/src/test/resources/event_workflow_integration_test.json b/test-harness/src/test/resources/event_workflow_integration_test.json
@@ -41,6 +41,5 @@
   "workflowStatusListenerEnabled": false,
   "timeoutPolicy": "ALERT_ONLY",
   "timeoutSeconds": 0,
-  "totalTimeoutSeconds": 50,
   "ownerEmail": "[email protected]"
 }