Skip to content

Fix worker options default application overriding poller behavior #2838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sushisource wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −3
Open

Fix worker options default application overriding poller behavior #2838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions temporal-sdk/src/main/java/io/temporal/worker/WorkerOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,17 @@ public WorkerOptions validateAndBuildWithDefaults() {
workerTuner,
maxTaskQueueActivitiesPerSecond,
maxConcurrentWorkflowTaskPollers == 0
? DEFAULT_MAX_CONCURRENT_WORKFLOW_TASK_POLLERS
? (workflowTaskPollersBehavior != null
? 0
: DEFAULT_MAX_CONCURRENT_WORKFLOW_TASK_POLLERS)
: maxConcurrentWorkflowTaskPollers,
maxConcurrentActivityTaskPollers == 0
? DEFAULT_MAX_CONCURRENT_ACTIVITY_TASK_POLLERS
? (activityTaskPollersBehavior != null
? 0
: DEFAULT_MAX_CONCURRENT_ACTIVITY_TASK_POLLERS)
: maxConcurrentActivityTaskPollers,
maxConcurrentNexusTaskPollers == 0
? DEFAULT_MAX_CONCURRENT_NEXUS_TASK_POLLERS
? (nexusTaskPollersBehavior != null ? 0 : DEFAULT_MAX_CONCURRENT_NEXUS_TASK_POLLERS)
: maxConcurrentNexusTaskPollers,
localActivityWorkerOnly,
defaultDeadlockDetectionTimeout == 0
Expand Down
29 changes: 29 additions & 0 deletions temporal-sdk/src/test/java/io/temporal/worker/WorkerOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,35 @@ public void throwsIfResourceControllerIsNotSame() {
nexusSlotSupplier));
}

@Test
public void validateAndBuildWithDefaultsDoesNotSetPollerDefaultsWhenBehaviorIsSet() {
WorkerOptions options =
WorkerOptions.newBuilder()
.setWorkflowTaskPollersBehavior(new PollerBehaviorAutoscaling())
.setActivityTaskPollersBehavior(new PollerBehaviorAutoscaling())
.setNexusTaskPollersBehavior(new PollerBehaviorAutoscaling())
.validateAndBuildWithDefaults();

assertEquals(0, options.getMaxConcurrentWorkflowTaskPollers());
assertEquals(0, options.getMaxConcurrentActivityTaskPollers());
assertEquals(0, options.getMaxConcurrentNexusTaskPollers());
assertNotNull(options.getWorkflowTaskPollersBehavior());
assertNotNull(options.getActivityTaskPollersBehavior());
assertNotNull(options.getNexusTaskPollersBehavior());
}

@Test
public void validateAndBuildWithDefaultsIsIdempotentWithPollerBehavior() {
WorkerOptions first =
WorkerOptions.newBuilder()
.setWorkflowTaskPollersBehavior(new PollerBehaviorAutoscaling())
.validateAndBuildWithDefaults();
WorkerOptions second = WorkerOptions.newBuilder(first).validateAndBuildWithDefaults();

assertEquals(0, second.getMaxConcurrentWorkflowTaskPollers());
assertNotNull(second.getWorkflowTaskPollersBehavior());
}

@Test
public void verifyMaxTaskQueuePerSecondsDisablesEagerExecution() {
// Verify that by default eager execution is enabled
Expand Down
Loading