Merge branch 'conductor-oss:main' into develop

ccctechcenter · Aug 2, 2024 · 9ca21c9 · 9ca21c9
2 parents df8ac66 + 94c3ead
commit 9ca21c9
Show file tree

Hide file tree

Showing 42 changed files with 2,505 additions and 2,288 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/config/ConductorProperties.java b/core/src/main/java/com/netflix/conductor/core/config/ConductorProperties.java
@@ -93,6 +93,9 @@ public class ConductorProperties {
     /** The number of threads to be used within the threadpool for system task workers. */
     private int systemTaskWorkerThreadCount = Runtime.getRuntime().availableProcessors() * 2;
 
+    /** The max number of the threads to be polled within the threadpool for system task workers. */
+    private int systemTaskMaxPollCount = systemTaskWorkerThreadCount;
+
     /**
      * The interval (in seconds) after which a system task will be checked by the system task worker
      * for completion.
@@ -360,6 +363,14 @@ public void setSystemTaskWorkerThreadCount(int systemTaskWorkerThreadCount) {
         this.systemTaskWorkerThreadCount = systemTaskWorkerThreadCount;
     }
 
+    public int getSystemTaskMaxPollCount() {
+        return systemTaskMaxPollCount;
+    }
+
+    public void setSystemTaskMaxPollCount(int systemTaskMaxPollCount) {
+        this.systemTaskMaxPollCount = systemTaskMaxPollCount;
+    }
+
     public Duration getSystemTaskWorkerCallbackDuration() {
         return systemTaskWorkerCallbackDuration;
     }

diff --git a/core/src/main/java/com/netflix/conductor/core/event/WorkflowCreationEvent.java b/core/src/main/java/com/netflix/conductor/core/event/WorkflowCreationEvent.java
diff --git a/core/src/main/java/com/netflix/conductor/core/event/WorkflowEvaluationEvent.java b/core/src/main/java/com/netflix/conductor/core/event/WorkflowEvaluationEvent.java
diff --git a/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java b/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java
@@ -27,7 +27,6 @@
 import com.netflix.conductor.common.utils.TaskUtils;
 import com.netflix.conductor.core.execution.StartWorkflowInput;
 import com.netflix.conductor.core.execution.WorkflowExecutor;
-import com.netflix.conductor.core.operation.StartWorkflowOperation;
 import com.netflix.conductor.core.utils.JsonUtils;
 import com.netflix.conductor.core.utils.ParametersUtils;
 import com.netflix.conductor.metrics.Monitors;
@@ -46,17 +45,14 @@ public class SimpleActionProcessor implements ActionProcessor {
     private final WorkflowExecutor workflowExecutor;
     private final ParametersUtils parametersUtils;
     private final JsonUtils jsonUtils;
-    private final StartWorkflowOperation startWorkflowOperation;
 
     public SimpleActionProcessor(
             WorkflowExecutor workflowExecutor,
             ParametersUtils parametersUtils,
-            JsonUtils jsonUtils,
-            StartWorkflowOperation startWorkflowOperation) {
+            JsonUtils jsonUtils) {
         this.workflowExecutor = workflowExecutor;
         this.parametersUtils = parametersUtils;
         this.jsonUtils = jsonUtils;
-        this.startWorkflowOperation = startWorkflowOperation;
     }
 
     public Map<String, Object> execute(
@@ -218,7 +214,7 @@ private Map<String, Object> startWorkflow(
             startWorkflowInput.setEvent(event);
             startWorkflowInput.setTaskToDomain(params.getTaskToDomain());
 
-            String workflowId = startWorkflowOperation.execute(startWorkflowInput);
+            String workflowId = workflowExecutor.startWorkflow(startWorkflowInput);
 
             output.put("workflowId", workflowId);
             LOGGER.debug(