Skip to content

Commit a029ae2

Browse files
sndrevancexu
authored andcommitted
Added missing fields to local activity task (#494)
1 parent ca3aa8f commit a029ae2

File tree

5 files changed

+44
-1
lines changed

5 files changed

+44
-1
lines changed

src/main/java/com/uber/cadence/internal/replay/ExecuteLocalActivityParameters.java

+31-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
package com.uber.cadence.internal.replay;
1919

2020
import com.uber.cadence.ActivityType;
21+
import com.uber.cadence.WorkflowExecution;
2122
import com.uber.cadence.common.RetryOptions;
2223
import java.util.Arrays;
2324

2425
public class ExecuteLocalActivityParameters {
2526

27+
private String workflowDomain;
28+
private WorkflowExecution workflowExecution;
2629
private String activityId;
2730
private ActivityType activityType;
2831
private byte[] input;
@@ -211,9 +214,30 @@ public void setElapsedTime(long startTime) {
211214
this.elapsedTime = startTime;
212215
}
213216

217+
public String getWorkflowDomain() {
218+
return workflowDomain;
219+
}
220+
221+
public void setWorkflowDomain(String workflowDomain) {
222+
this.workflowDomain = workflowDomain;
223+
}
224+
225+
public WorkflowExecution getWorkflowExecution() {
226+
return workflowExecution;
227+
}
228+
229+
public void setWorkflowExecution(WorkflowExecution workflowExecution) {
230+
this.workflowExecution = workflowExecution;
231+
}
232+
214233
@Override
215234
public String toString() {
216-
return "ExecuteActivityParameters{"
235+
return "ExecuteLocalActivityParameters{"
236+
+ "workflowDomain='"
237+
+ workflowDomain
238+
+ '\''
239+
+ ", workflowExecution="
240+
+ workflowExecution
217241
+ "activityId='"
218242
+ activityId
219243
+ '\''
@@ -223,6 +247,12 @@ public String toString() {
223247
+ Arrays.toString(input)
224248
+ ", scheduleToCloseTimeoutSeconds="
225249
+ scheduleToCloseTimeoutSeconds
250+
+ ", retryOptions="
251+
+ retryOptions
252+
+ ", elapsedTime="
253+
+ elapsedTime
254+
+ ", attempt="
255+
+ attempt
226256
+ '}';
227257
}
228258
}

src/main/java/com/uber/cadence/internal/sync/SyncDecisionContext.java

+2
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ private ExecuteLocalActivityParameters constructExecuteLocalActivityParameters(
334334
}
335335
parameters.setAttempt(attempt);
336336
parameters.setElapsedTime(elapsed);
337+
parameters.setWorkflowDomain(this.context.getDomain());
338+
parameters.setWorkflowExecution(this.context.getWorkflowExecution());
337339
return parameters;
338340
}
339341

src/main/java/com/uber/cadence/internal/testservice/StateMachines.java

+1
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ private static void scheduleActivityTask(
733733

734734
PollForActivityTaskResponse taskResponse =
735735
new PollForActivityTaskResponse()
736+
.setWorkflowDomain(ctx.getDomain())
736737
.setWorkflowType(data.startWorkflowExecutionRequest.workflowType)
737738
.setActivityType(d.getActivityType())
738739
.setWorkflowExecution(ctx.getExecution())

src/main/java/com/uber/cadence/internal/worker/LocalActivityWorker.java

+5
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ private ActivityTaskHandler.Result handleLocalActivity(Task task) throws Interru
212212
metricsScope.counter(MetricsType.LOCAL_ACTIVITY_TOTAL_COUNTER).inc(1);
213213

214214
PollForActivityTaskResponse pollTask = new PollForActivityTaskResponse();
215+
pollTask.setWorkflowDomain(task.params.getWorkflowDomain());
216+
pollTask.setActivityId(task.params.getActivityId());
217+
pollTask.setWorkflowExecution(task.params.getWorkflowExecution());
218+
pollTask.setScheduledTimestamp(System.currentTimeMillis());
219+
pollTask.setStartedTimestamp(System.currentTimeMillis());
215220
pollTask.setActivityType(task.params.getActivityType());
216221
pollTask.setInput(task.params.getInput());
217222
pollTask.setAttempt(task.params.getAttempt());

src/test/java/com/uber/cadence/workflow/WorkflowTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -3726,6 +3726,11 @@ public void heartbeatAndThrowIO() {
37263726

37273727
@Override
37283728
public void throwIO() {
3729+
assertEquals(DOMAIN, Activity.getTask().getWorkflowDomain());
3730+
assertNotNull(Activity.getTask().getWorkflowExecution());
3731+
assertNotNull(Activity.getTask().getWorkflowExecution().getWorkflowId());
3732+
assertFalse(Activity.getTask().getWorkflowExecution().getWorkflowId().isEmpty());
3733+
assertFalse(Activity.getTask().getWorkflowExecution().getRunId().isEmpty());
37293734
lastAttempt = Activity.getTask().getAttempt();
37303735
invocations.add("throwIO");
37313736
try {

0 commit comments

Comments
 (0)