Skip to content

Commit 40538a5

Browse files
committed
feat: separate executor service for workflow
1 parent 95d25fe commit 40538a5

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/builder/WorkflowBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.fabric8.kubernetes.api.model.HasMetadata;
99
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
10+
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
1011
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
1112
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
1213
import io.javaoperatorsdk.operator.processing.dependent.workflow.DependentResourceNode;
@@ -75,8 +76,8 @@ public WorkflowBuilder<P> withThrowExceptionFurther(boolean throwExceptionFurthe
7576
}
7677

7778
public Workflow<P> build() {
78-
return new Workflow(dependentResourceNodes,
79-
ConfigurationServiceProvider.instance().getExecutorService(), throwExceptionAutomatically);
79+
return new Workflow(
80+
dependentResourceNodes, ExecutorServiceManager.instance().executorService(), throwExceptionAutomatically);
8081
}
8182

8283
public Workflow<P> build(int parallelism) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,13 +390,13 @@ public void run() {
390390
final var name = thread.getName();
391391
try {
392392
MDCUtils.addResourceInfo(executionScope.getResource());
393-
thread.setName("EventHandler-" + controllerName);
393+
// thread.setName("EventHandler-" + controllerName);
394394
PostExecutionControl<R> postExecutionControl =
395395
reconciliationDispatcher.handleExecution(executionScope);
396396
eventProcessingFinished(executionScope, postExecutionControl);
397397
} finally {
398398
// restore original name
399-
thread.setName(name);
399+
// thread.setName(name);
400400
MDCUtils.removeResourceInfo();
401401
}
402402
}

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package io.javaoperatorsdk.operator.sample;
22

33
import java.io.IOException;
4+
import java.util.function.Consumer;
45

6+
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
57
import org.slf4j.Logger;
68
import org.slf4j.LoggerFactory;
79
import org.takes.facets.fork.FkRegex;

sample-operators/webpage/src/main/resources/log4j2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Configuration status="WARN">
33
<Appenders>
44
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%style{%d}{yellow} %style{%-30c{1.}}{cyan} %highlight{[%-5level] %msg%n%throwable}{INFO=black}"/>
5+
<PatternLayout pattern="%tn %style{%d}{yellow} %style{%-30c{1.}}{cyan} %highlight{[%-5level] %msg%n%throwable}{INFO=black}"/>
66
</Console>
77
</Appenders>
88
<Loggers>

0 commit comments

Comments
 (0)