Fix identity for sticky worker (#659)

cadence-workflow · Nov 23, 2021 · 216a287 · 216a287
1 parent 317135c
commit 216a287
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/src/main/java/com/uber/cadence/worker/WorkerFactory.java b/src/main/java/com/uber/cadence/worker/WorkerFactory.java
@@ -33,6 +33,9 @@
 import com.uber.cadence.internal.worker.WorkflowPollTaskFactory;
 import com.uber.m3.tally.Scope;
 import com.uber.m3.util.ImmutableMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -45,8 +48,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /** Maintains worker creation and lifecycle. */
 public final class WorkerFactory {
@@ -63,7 +64,7 @@ public static WorkerFactory newInstance(
   private final List<Worker> workers = new ArrayList<>();
   private final WorkflowClient workflowClient;
   // Guarantee uniqueness for stickyTaskListName when multiple factories
-  private final UUID id = UUID.randomUUID();
+  private final UUID stickyTasklistRandomId = UUID.randomUUID();
   private final ThreadPoolExecutor workflowThreadPool;
   private final AtomicInteger workflowThreadCounter = new AtomicInteger();
   private final WorkerFactoryOptions factoryOptions;
@@ -122,20 +123,20 @@ public WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factory
     dispatcher = new PollDecisionTaskDispatcher(workflowClient.getService());
     stickyPoller =
         new Poller<>(
-            id.toString(),
-            new WorkflowPollTaskFactory(
-                    workflowClient.getService(),
-                    workflowClient.getOptions().getDomain(),
-                    getStickyTaskListName(),
-                    stickyScope,
-                    id.toString())
-                .get(),
-            dispatcher,
-            PollerOptions.newBuilder()
-                .setPollThreadNamePrefix(POLL_THREAD_NAME)
-                .setPollThreadCount(this.factoryOptions.getStickyPollerCount())
-                .build(),
-            stickyScope);
+                workflowClient.getOptions().getIdentity(),
+                new WorkflowPollTaskFactory(
+                        workflowClient.getService(),
+                        workflowClient.getOptions().getDomain(),
+                        getStickyTaskListName(),
+                        stickyScope,
+                        workflowClient.getOptions().getIdentity())
+                        .get(),
+                dispatcher,
+                PollerOptions.newBuilder()
+                        .setPollThreadNamePrefix(POLL_THREAD_NAME)
+                        .setPollThreadCount(this.factoryOptions.getStickyPollerCount())
+                        .build(),
+                stickyScope);
   }
 
   /**
@@ -336,8 +337,8 @@ private String getHostName() {
   @VisibleForTesting
   String getStickyTaskListName() {
     return this.factoryOptions.isDisableStickyExecution()
-        ? null
-        : String.format("%s:%s:%s", STICKY_TASK_LIST_PREFIX, getHostName(), id);
+            ? null
+            : String.format("%s:%s:%s", STICKY_TASK_LIST_PREFIX, getHostName(), stickyTasklistRandomId);
   }
 
   public synchronized void suspendPolling() {