Skip to content

Set deploymentOptions on other types of poll requests #2555

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

Merged
Quinn-With-Two-Ns merged 1 commit into from
Jun 12, 2025
Merged

Set deploymentOptions on other types of poll requests #2555

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
15 changes: 9 additions & 6 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityPollTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -39,8 +38,7 @@ public ActivityPollTask(
@Nonnull String namespace,
@Nonnull String taskQueue,
@Nonnull String identity,
@Nullable String buildId,
boolean useBuildIdForVersioning,
@Nonnull WorkerVersioningOptions versioningOptions,
double activitiesPerSecond,
@Nonnull TrackingSlotSupplier<ActivitySlotInfo> slotSupplier,
@Nonnull Scope metricsScope,
Expand All @@ -61,13 +59,18 @@ public ActivityPollTask(
.build());
}

if (serverCapabilities.get().getBuildIdBasedVersioning()) {
if (versioningOptions.getWorkerDeploymentOptions() != null) {
pollRequest.setDeploymentOptions(
WorkerVersioningProtoUtils.deploymentOptionsToProto(
versioningOptions.getWorkerDeploymentOptions()));
} else if (serverCapabilities.get().getBuildIdBasedVersioning()) {
pollRequest.setWorkerVersionCapabilities(
WorkerVersionCapabilities.newBuilder()
.setBuildId(buildId)
.setUseVersioning(useBuildIdForVersioning)
.setBuildId(versioningOptions.getBuildId())
.setUseVersioning(versioningOptions.isUsingVersioning())
.build());
}

this.pollRequest = pollRequest.build();
}

Expand Down
6 changes: 2 additions & 4 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ public boolean start() {
namespace,
taskQueue,
options.getIdentity(),
options.getBuildId(),
options.isUsingBuildIdForVersioning(),
options.getWorkerVersioningOptions(),
taskQueueActivitiesPerSecond,
this.slotSupplier,
workerMetricsScope,
Expand All @@ -118,8 +117,7 @@ public boolean start() {
namespace,
taskQueue,
options.getIdentity(),
options.getBuildId(),
options.isUsingBuildIdForVersioning(),
options.getWorkerVersioningOptions(),
taskQueueActivitiesPerSecond,
this.slotSupplier,
workerMetricsScope,
Expand Down
14 changes: 8 additions & 6 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/AsyncActivityPollTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -45,8 +44,7 @@ public AsyncActivityPollTask(
@Nonnull String namespace,
@Nonnull String taskQueue,
@Nonnull String identity,
@Nullable String buildId,
boolean useBuildIdForVersioning,
@Nonnull WorkerVersioningOptions versioningOptions,
double activitiesPerSecond,
@Nonnull TrackingSlotSupplier<ActivitySlotInfo> slotSupplier,
@Nonnull Scope metricsScope,
Expand All @@ -67,11 +65,15 @@ public AsyncActivityPollTask(
.build());
}

if (serverCapabilities.get().getBuildIdBasedVersioning()) {
if (versioningOptions.getWorkerDeploymentOptions() != null) {
pollRequest.setDeploymentOptions(
WorkerVersioningProtoUtils.deploymentOptionsToProto(
versioningOptions.getWorkerDeploymentOptions()));
} else if (serverCapabilities.get().getBuildIdBasedVersioning()) {
pollRequest.setWorkerVersionCapabilities(
WorkerVersionCapabilities.newBuilder()
.setBuildId(buildId)
.setUseVersioning(useBuildIdForVersioning)
.setBuildId(versioningOptions.getBuildId())
.setUseVersioning(versioningOptions.isUsingVersioning())
.build());
}
this.pollRequest = pollRequest.build();
Expand Down
14 changes: 8 additions & 6 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/AsyncNexusPollTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -43,8 +42,7 @@ public AsyncNexusPollTask(
@Nonnull String namespace,
@Nonnull String taskQueue,
@Nonnull String identity,
@Nullable String buildId,
boolean useBuildIdForVersioning,
@Nonnull WorkerVersioningOptions versioningOptions,
@Nonnull Scope metricsScope,
@Nonnull Supplier<GetSystemInfoResponse.Capabilities> serverCapabilities,
TrackingSlotSupplier<?> slotSupplier) {
Expand All @@ -58,11 +56,15 @@ public AsyncNexusPollTask(
.setIdentity(identity)
.setTaskQueue(TaskQueue.newBuilder().setName(taskQueue));

if (serverCapabilities.get().getBuildIdBasedVersioning()) {
if (versioningOptions.getWorkerDeploymentOptions() != null) {
pollRequest.setDeploymentOptions(
WorkerVersioningProtoUtils.deploymentOptionsToProto(
versioningOptions.getWorkerDeploymentOptions()));
} else if (serverCapabilities.get().getBuildIdBasedVersioning()) {
pollRequest.setWorkerVersionCapabilities(
WorkerVersionCapabilities.newBuilder()
.setBuildId(buildId)
.setUseVersioning(useBuildIdForVersioning)
.setBuildId(versioningOptions.getBuildId())
.setUseVersioning(versioningOptions.isUsingVersioning())
.build());
}
this.pollRequest = pollRequest.build();
Expand Down
14 changes: 8 additions & 6 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/NexusPollTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -36,8 +35,7 @@ public NexusPollTask(
@Nonnull String namespace,
@Nonnull String taskQueue,
@Nonnull String identity,
@Nullable String buildId,
boolean useBuildIdForVersioning,
@Nonnull WorkerVersioningOptions versioningOptions,
@Nonnull TrackingSlotSupplier<NexusSlotInfo> slotSupplier,
@Nonnull Scope metricsScope,
@Nonnull Supplier<GetSystemInfoResponse.Capabilities> serverCapabilities) {
Expand All @@ -51,11 +49,15 @@ public NexusPollTask(
.setIdentity(identity)
.setTaskQueue(TaskQueue.newBuilder().setName(taskQueue));

if (serverCapabilities.get().getBuildIdBasedVersioning()) {
if (versioningOptions.getWorkerDeploymentOptions() != null) {
pollRequest.setDeploymentOptions(
WorkerVersioningProtoUtils.deploymentOptionsToProto(
versioningOptions.getWorkerDeploymentOptions()));
} else if (serverCapabilities.get().getBuildIdBasedVersioning()) {
pollRequest.setWorkerVersionCapabilities(
WorkerVersionCapabilities.newBuilder()
.setBuildId(buildId)
.setUseVersioning(useBuildIdForVersioning)
.setBuildId(versioningOptions.getBuildId())
.setUseVersioning(versioningOptions.isUsingVersioning())
.build());
}
this.pollRequest = pollRequest.build();
Expand Down
6 changes: 2 additions & 4 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/NexusWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ public boolean start() {
namespace,
taskQueue,
options.getIdentity(),
options.getBuildId(),
options.isUsingBuildIdForVersioning(),
options.getWorkerVersioningOptions(),
workerMetricsScope,
service.getServerCapabilities(),
this.slotSupplier),
Expand All @@ -113,8 +112,7 @@ public boolean start() {
namespace,
taskQueue,
options.getIdentity(),
options.getBuildId(),
options.isUsingBuildIdForVersioning(),
options.getWorkerVersioningOptions(),
this.slotSupplier,
workerMetricsScope,
service.getServerCapabilities()),
Expand Down
Loading