pass retry count to state save exception analyzer

NitorCreations · Feb 5, 2021 · 55ad024 · 55ad024
1 parent 3bbf8a8
commit 55ad024
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/nflow-engine/src/main/java/io/nflow/engine/exception/DefaultStateSaveExceptionAnalyzer.java b/nflow-engine/src/main/java/io/nflow/engine/exception/DefaultStateSaveExceptionAnalyzer.java
@@ -32,7 +32,7 @@ public DefaultStateSaveExceptionAnalyzer(Environment env) {
    * {@inheritDoc}
    */
   @Override
-  public StateSaveExceptionHandling analyze(Exception e) {
+  public StateSaveExceptionHandling analyze(Exception e, int saveRetryCount) {
     return handling;
   }
 }
diff --git a/nflow-engine/src/main/java/io/nflow/engine/exception/StateSaveExceptionAnalyzer.java b/nflow-engine/src/main/java/io/nflow/engine/exception/StateSaveExceptionAnalyzer.java
@@ -14,7 +14,9 @@ public interface StateSaveExceptionAnalyzer {
    *
    * @param e
    *          The exception to be analyzed.
+   * @param saveRetryCount
+   *          How many times the saving has been attempted before this attempt.
    * @return How the exception should be handled.
    */
-  StateSaveExceptionHandling analyze(Exception e);
+  StateSaveExceptionHandling analyze(Exception e, int saveRetryCount);
 }
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowStateProcessor.java b/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowStateProcessor.java
@@ -291,6 +291,7 @@ private WorkflowInstance saveWorkflowInstanceState(StateExecutionImpl execution,
         .setStateText(getStateText(instance, execution)) //
         .setState(execution.getNextState()) //
         .setRetries(execution.isRetry() ? execution.getRetries() + 1 : 0);
+    int saveRetryCount = 0;
     while (true) {
       try {
         return persistWorkflowInstanceState(execution, instance.stateVariables, actionBuilder, instanceBuilder);
@@ -302,7 +303,7 @@ private WorkflowInstance saveWorkflowInstanceState(StateExecutionImpl execution,
           // return the original instance since persisting failed
           return instance;
         }
-        StateSaveExceptionHandling handling = stateSaveExceptionAnalyzer.analyze(ex);
+        StateSaveExceptionHandling handling = stateSaveExceptionAnalyzer.analyze(ex, saveRetryCount++);
         if (handling.logStackTrace) {
           nflowLogger.log(logger, handling.logLevel, "Failed to save workflow instance {} new state, retrying after {} seconds.",
               new Object[] { instance.id, handling.retryDelay, ex });

diff --git a/...engine/src/test/java/io/nflow/engine/exception/DefaultStateSaveExceptionAnalyzerTest.java b/...engine/src/test/java/io/nflow/engine/exception/DefaultStateSaveExceptionAnalyzerTest.java
@@ -16,7 +16,7 @@ public class DefaultStateSaveExceptionAnalyzerTest {
 
   @Test
   void analyzeReturnsConfiguredDelay() {
-    StateSaveExceptionHandling handling = analyzer.analyze(new Exception());
+    StateSaveExceptionHandling handling = analyzer.analyze(new Exception(), 0);
 
     assertEquals(handling.logLevel, Level.ERROR);
     assertTrue(handling.logStackTrace);