Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(swf): deliver Lambda outcomes through one decision task (#5859)

Andre Kuraite1fe876149e0
diff --git a/src/main/java/io/github/hectorvent/floci/services/swf/SwfService.java b/src/main/java/io/github/hectorvent/floci/services/swf/SwfService.java
index 3527f0a7c6..79821ac6ff 100644
--- a/src/main/java/io/github/hectorvent/floci/services/swf/SwfService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/swf/SwfService.java
@@ -548,6 +548,7 @@ public class SwfService implements Resettable {
}
task.setState(SwfDecisionTask.STATE_STARTED);
+ execution.setDecisionNeeded(false);
task.setIdentity(identity);
task.setStartedTimestamp(now());
SwfHistoryEvent started = appendEvent(execution, "DecisionTaskStarted");
@@ -1275,11 +1276,7 @@ public class SwfService implements Resettable {
.attr("reason", reason)
.attr("details", details)
.attr("result", result);
- if (hasNothingPending(execution)) {
- scheduleDecisionTask(execution);
- } else {
- execution.setDecisionNeeded(true);
- }
+ scheduleDecisionTaskIfIdle(execution);
executionStore.put(pending.executionKey(), execution);
}
}
@@ -1897,13 +1894,6 @@ public class SwfService implements Resettable {
.isPresent());
}
- /**
- * True when nothing is pending, so the decider gets another decision task rather than
- * an execution stalled with no outstanding work and no scheduled decision.
- */
- private boolean hasNothingPending(SwfWorkflowExecution execution) {
- return !hasOpenWork(execution);
- }
public int openActivityCount(SwfWorkflowExecution execution) {
return (int) execution.getActivities().values().stream().filter(SwfActivityTask::isOpen).count();
diff --git a/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java
index ba794ffc7a..c73954c233 100644
--- a/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java
@@ -611,6 +611,68 @@ class SwfServiceTest {
assertEquals("DecisionTaskScheduled", events.get(events.size() - 1).getEventType());
}
+ @ParameterizedTest
+ @CsvSource({"timer,false", "timer,true", "activity,false", "activity,true",
+ "queued,false", "queued,true"})
+ void lambdaOutcome_deliversOneDecisionDespiteOtherPendingWork(String pending, boolean failed) {
+ service.registerWorkflowType(REGION, DOMAIN, lambdaWorkflowType("LW", "1",
+ "arn:aws:iam::000000000000:role/swf-lambda"));
+ String runId = startLambdaWf("wf-lambda-outcome", "LW");
+ SwfDecisionTask first = pollFor("wf-lambda-outcome");
+ if (failed) {
+ lambdaResponse = new LambdaInvocationResult("{\"errorMessage\":\"boom\"}", "Unhandled");
+ }
+ Decision other = switch (pending) {
+ case "timer" -> new Decision("StartTimer", Map.of("timerId", "timer", "startToFireTimeout", "60"));
+ case "activity" -> new Decision("ScheduleActivityTask", Map.of(
+ "activityId", "activity", "activityType", Map.of("name", "A", "version", "1")));
+ default -> new Decision("CancelTimer", Map.of("timerId", "missing"));
+ };
+
+ service.respondDecisionTaskCompleted(first.getTaskToken(), List.of(
+ other, scheduleLambda("lambda", "my-fn", null, null, null)), null);
+
+ List<SwfHistoryEvent> history = service.getWorkflowExecutionHistory(
+ REGION, DOMAIN, "wf-lambda-outcome", runId, false);
+ assertEquals(2, history.stream().filter(e -> "DecisionTaskScheduled".equals(e.getEventType())).count());
+ assertNotNull(eventOfType(history, failed ? "LambdaFunctionFailed" : "LambdaFunctionCompleted"));
+ assertEquals(1, service.countPendingDecisionTasks(REGION, DOMAIN, "tl"));
+ SwfDecisionTask outcome = pollFor("wf-lambda-outcome");
+ assertEquals(first.getStartedEventId(), outcome.getPreviousStartedEventId());
+ service.respondDecisionTaskCompleted(outcome.getTaskToken(), List.of(), null);
+ assertEquals(0, service.countPendingDecisionTasks(REGION, DOMAIN, "tl"));
+ assertTrue(service.pollForDecisionTask(REGION, DOMAIN, "tl", "idle").isEmpty());
+ }
+
+ @Test
+ void lambdaOutcomeDuringAStartedDecision_isDeliveredByOneSuccessor() throws Exception {
+ service.registerWorkflowType(REGION, DOMAIN, lambdaWorkflowType("LW", "1",
+ "arn:aws:iam::000000000000:role/swf-lambda"));
+ String runId = startLambdaWf("wf-lambda-in-flight", "LW");
+ SwfDecisionTask first = pollFor("wf-lambda-in-flight");
+ lambdaGate = new LambdaGate(new CountDownLatch(1), new CountDownLatch(1));
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ try {
+ Future<?> scheduling = executor.submit(() -> service.respondDecisionTaskCompleted(
+ first.getTaskToken(), List.of(scheduleLambda("lambda", "my-fn", null, null, null)), null));
+ assertTrue(lambdaGate.started().await(5, TimeUnit.SECONDS));
+ service.signalWorkflowExecution(REGION, DOMAIN, "wf-lambda-in-flight", runId, "inspect", null);
+ SwfDecisionTask active = pollFor("wf-lambda-in-flight");
+ lambdaGate.release().countDown();
+ scheduling.get(10, TimeUnit.SECONDS);
+ assertEquals(0, service.countPendingDecisionTasks(REGION, DOMAIN, "tl"));
+ service.respondDecisionTaskCompleted(active.getTaskToken(), List.of(), null);
+ assertEquals(1, service.countPendingDecisionTasks(REGION, DOMAIN, "tl"));
+ SwfDecisionTask successor = pollFor("wf-lambda-in-flight");
+ assertEquals(active.getStartedEventId(), successor.getPreviousStartedEventId());
+ service.respondDecisionTaskCompleted(successor.getTaskToken(), List.of(), null);
+ assertEquals(0, service.countPendingDecisionTasks(REGION, DOMAIN, "tl"));
+ } finally {
+ lambdaGate.release().countDown();
+ executor.shutdownNow();
+ }
+ }
+
@Test
void scheduleLambdaFunction_whenTheHandlerErrors_recordsFailedWithTheFunctionError() {
service.registerWorkflowType(REGION, DOMAIN, lambdaWorkflowType("LW", "1",