Skip to content

Commit 7f47427

Browse files
author
Shailesh Jagannath Padave
committed
if totalTaskTimeOut is 0 we shoudl return
1 parent 79efa13 commit 7f47427

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

core/src/main/java/com/netflix/conductor/core/execution/DeciderService.java

+1
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ void checkTaskTimeout(TaskDef taskDef, TaskModel task) {
706706
}
707707
if (task.getStatus().isTerminal()
708708
|| taskDef.getTimeoutSeconds() <= 0
709+
|| taskDef.getTotalTimeoutSeconds() <= 0
709710
|| task.getStartTime() <= 0) {
710711
return;
711712
}

core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java

+1
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ public void testTaskTimeout() {
498498
taskType.setName("test");
499499
taskType.setTimeoutPolicy(TimeoutPolicy.RETRY);
500500
taskType.setTimeoutSeconds(1);
501+
taskType.setTotalTimeoutSeconds(1_000);
501502

502503
TaskModel task = new TaskModel();
503504
task.setTaskType(taskType.getName());

test-harness/src/test/resources/event_workflow_integration_test.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
"workflowStatusListenerEnabled": false,
4242
"timeoutPolicy": "ALERT_ONLY",
4343
"timeoutSeconds": 0,
44+
"totalTimeoutSeconds": 50,
4445
"ownerEmail": "[email protected]"
4546
}

0 commit comments

Comments
 (0)