Skip to content

Commit 50700e7

Browse files
mfateevmfateev
authored
Updated Thrift and disabled sticky for docker unit tests (#220)
* Updated thrift files to the latest version * Fixed compile time errors after the thrift update * Temporary disabled sticky for tests that use docker * Increased test timeout as travis is very weak
1 parent f3dae0c commit 50700e7

16 files changed

+985
-95
lines changed

‎src/main/java/com/uber/cadence/internal/metrics/ServiceMethod.java

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class ServiceMethod {
2222
MetricsType.CADENCE_METRICS_PREFIX + "DeprecateDomain";
2323
public static final String DESCRIBE_DOMAIN =
2424
MetricsType.CADENCE_METRICS_PREFIX + "DescribeDomain";
25+
public static final String LIST_DOMAINS = MetricsType.CADENCE_METRICS_PREFIX + "ListDomains";
2526
public static final String GET_WORKFLOW_EXECUTION_HISTORY =
2627
MetricsType.CADENCE_METRICS_PREFIX + "GetWorkflowExecutionHistory";
2728
public static final String LIST_CLOSED_WORKFLOW_EXECUTIONS =
@@ -72,4 +73,6 @@ public class ServiceMethod {
7273
MetricsType.CADENCE_METRICS_PREFIX + "RespondQueryTaskCompleted";
7374
public static final String DESCRIBE_WORKFLOW_EXECUTION =
7475
MetricsType.CADENCE_METRICS_PREFIX + "DescribeWorkflowExecution";
76+
public static final String RESET_STICKY_TASK_LIST =
77+
MetricsType.CADENCE_METRICS_PREFIX + "ResetStickyTaskList";
7578
}

‎src/main/java/com/uber/cadence/internal/sync/TestActivityEnvironmentInternal.java

+71-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@
2929
import com.uber.cadence.DescribeWorkflowExecutionRequest;
3030
import com.uber.cadence.DescribeWorkflowExecutionResponse;
3131
import com.uber.cadence.DomainAlreadyExistsError;
32+
import com.uber.cadence.DomainNotActiveError;
3233
import com.uber.cadence.EntityNotExistsError;
3334
import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
3435
import com.uber.cadence.GetWorkflowExecutionHistoryResponse;
3536
import com.uber.cadence.InternalServiceError;
37+
import com.uber.cadence.LimitExceededError;
3638
import com.uber.cadence.ListClosedWorkflowExecutionsRequest;
3739
import com.uber.cadence.ListClosedWorkflowExecutionsResponse;
40+
import com.uber.cadence.ListDomainsRequest;
41+
import com.uber.cadence.ListDomainsResponse;
3842
import com.uber.cadence.ListOpenWorkflowExecutionsRequest;
3943
import com.uber.cadence.ListOpenWorkflowExecutionsResponse;
4044
import com.uber.cadence.PollForActivityTaskRequest;
@@ -44,20 +48,25 @@
4448
import com.uber.cadence.QueryFailedError;
4549
import com.uber.cadence.QueryWorkflowRequest;
4650
import com.uber.cadence.QueryWorkflowResponse;
51+
import com.uber.cadence.RecordActivityTaskHeartbeatByIDRequest;
4752
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
4853
import com.uber.cadence.RecordActivityTaskHeartbeatResponse;
4954
import com.uber.cadence.RegisterDomainRequest;
5055
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
56+
import com.uber.cadence.ResetStickyTaskListRequest;
57+
import com.uber.cadence.ResetStickyTaskListResponse;
5158
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
5259
import com.uber.cadence.RespondActivityTaskCanceledRequest;
5360
import com.uber.cadence.RespondActivityTaskCompletedByIDRequest;
5461
import com.uber.cadence.RespondActivityTaskCompletedRequest;
5562
import com.uber.cadence.RespondActivityTaskFailedByIDRequest;
5663
import com.uber.cadence.RespondActivityTaskFailedRequest;
5764
import com.uber.cadence.RespondDecisionTaskCompletedRequest;
65+
import com.uber.cadence.RespondDecisionTaskCompletedResponse;
5866
import com.uber.cadence.RespondDecisionTaskFailedRequest;
5967
import com.uber.cadence.RespondQueryTaskCompletedRequest;
6068
import com.uber.cadence.ServiceBusyError;
69+
import com.uber.cadence.SignalWithStartWorkflowExecutionRequest;
6170
import com.uber.cadence.SignalWorkflowExecutionRequest;
6271
import com.uber.cadence.StartWorkflowExecutionRequest;
6372
import com.uber.cadence.StartWorkflowExecutionResponse;
@@ -379,6 +388,14 @@ public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeat(
379388
return impl.RecordActivityTaskHeartbeat(heartbeatRequest);
380389
}
381390

391+
@Override
392+
public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeatByID(
393+
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest)
394+
throws BadRequestError, InternalServiceError, EntityNotExistsError, DomainNotActiveError,
395+
LimitExceededError, ServiceBusyError, TException {
396+
return impl.RecordActivityTaskHeartbeatByID(heartbeatRequest);
397+
}
398+
382399
@Override
383400
public void RespondActivityTaskCompleted(RespondActivityTaskCompletedRequest completeRequest)
384401
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
@@ -431,6 +448,15 @@ public void SignalWorkflowExecution(SignalWorkflowExecutionRequest signalRequest
431448
impl.SignalWorkflowExecution(signalRequest);
432449
}
433450

451+
@Override
452+
public StartWorkflowExecutionResponse SignalWithStartWorkflowExecution(
453+
SignalWithStartWorkflowExecutionRequest signalWithStartRequest)
454+
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
455+
DomainNotActiveError, LimitExceededError, WorkflowExecutionAlreadyStartedError,
456+
TException {
457+
return impl.SignalWithStartWorkflowExecution(signalWithStartRequest);
458+
}
459+
434460
@Override
435461
public void TerminateWorkflowExecution(TerminateWorkflowExecutionRequest terminateRequest)
436462
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
@@ -460,6 +486,13 @@ public void RespondQueryTaskCompleted(RespondQueryTaskCompletedRequest completeR
460486
impl.RespondQueryTaskCompleted(completeRequest);
461487
}
462488

489+
@Override
490+
public ResetStickyTaskListResponse ResetStickyTaskList(ResetStickyTaskListRequest resetRequest)
491+
throws BadRequestError, InternalServiceError, EntityNotExistsError, LimitExceededError,
492+
ServiceBusyError, DomainNotActiveError, TException {
493+
return impl.ResetStickyTaskList(resetRequest);
494+
}
495+
463496
@Override
464497
public QueryWorkflowResponse QueryWorkflow(QueryWorkflowRequest queryRequest)
465498
throws BadRequestError, InternalServiceError, EntityNotExistsError, QueryFailedError,
@@ -494,6 +527,12 @@ public void DescribeDomain(
494527
impl.DescribeDomain(describeRequest, resultHandler);
495528
}
496529

530+
@Override
531+
public void ListDomains(ListDomainsRequest listRequest, AsyncMethodCallback resultHandler)
532+
throws TException {
533+
impl.ListDomains(listRequest, resultHandler);
534+
}
535+
497536
@Override
498537
public void UpdateDomain(UpdateDomainRequest updateRequest, AsyncMethodCallback resultHandler)
499538
throws TException {
@@ -556,6 +595,13 @@ public void RecordActivityTaskHeartbeat(
556595
impl.RecordActivityTaskHeartbeat(heartbeatRequest, resultHandler);
557596
}
558597

598+
@Override
599+
public void RecordActivityTaskHeartbeatByID(
600+
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest, AsyncMethodCallback resultHandler)
601+
throws TException {
602+
impl.RecordActivityTaskHeartbeatByID(heartbeatRequest, resultHandler);
603+
}
604+
559605
@Override
560606
public void RespondActivityTaskCompleted(
561607
RespondActivityTaskCompletedRequest completeRequest, AsyncMethodCallback resultHandler)
@@ -612,6 +658,14 @@ public void SignalWorkflowExecution(
612658
impl.SignalWorkflowExecution(signalRequest, resultHandler);
613659
}
614660

661+
@Override
662+
public void SignalWithStartWorkflowExecution(
663+
SignalWithStartWorkflowExecutionRequest signalWithStartRequest,
664+
AsyncMethodCallback resultHandler)
665+
throws TException {
666+
impl.SignalWithStartWorkflowExecution(signalWithStartRequest, resultHandler);
667+
}
668+
615669
@Override
616670
public void TerminateWorkflowExecution(
617671
TerminateWorkflowExecutionRequest terminateRequest, AsyncMethodCallback resultHandler)
@@ -640,6 +694,13 @@ public void RespondQueryTaskCompleted(
640694
impl.RespondQueryTaskCompleted(completeRequest, resultHandler);
641695
}
642696

697+
@Override
698+
public void ResetStickyTaskList(
699+
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler)
700+
throws TException {
701+
impl.ResetStickyTaskList(resetRequest, resultHandler);
702+
}
703+
643704
@Override
644705
public void QueryWorkflow(QueryWorkflowRequest queryRequest, AsyncMethodCallback resultHandler)
645706
throws TException {
@@ -671,6 +732,13 @@ public DescribeDomainResponse DescribeDomain(DescribeDomainRequest describeReque
671732
return impl.DescribeDomain(describeRequest);
672733
}
673734

735+
@Override
736+
public ListDomainsResponse ListDomains(ListDomainsRequest listRequest)
737+
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
738+
TException {
739+
return impl.ListDomains(listRequest);
740+
}
741+
674742
@Override
675743
public UpdateDomainResponse UpdateDomain(UpdateDomainRequest updateRequest)
676744
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
@@ -706,9 +774,10 @@ public PollForDecisionTaskResponse PollForDecisionTask(PollForDecisionTaskReques
706774
}
707775

708776
@Override
709-
public void RespondDecisionTaskCompleted(RespondDecisionTaskCompletedRequest completeRequest)
777+
public RespondDecisionTaskCompletedResponse RespondDecisionTaskCompleted(
778+
RespondDecisionTaskCompletedRequest completeRequest)
710779
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
711-
impl.RespondDecisionTaskCompleted(completeRequest);
780+
return impl.RespondDecisionTaskCompleted(completeRequest);
712781
}
713782

714783
@Override

‎src/main/java/com/uber/cadence/internal/sync/TestWorkflowEnvironmentInternal.java

+71-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@
2727
import com.uber.cadence.DescribeWorkflowExecutionRequest;
2828
import com.uber.cadence.DescribeWorkflowExecutionResponse;
2929
import com.uber.cadence.DomainAlreadyExistsError;
30+
import com.uber.cadence.DomainNotActiveError;
3031
import com.uber.cadence.EntityNotExistsError;
3132
import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
3233
import com.uber.cadence.GetWorkflowExecutionHistoryResponse;
3334
import com.uber.cadence.InternalServiceError;
35+
import com.uber.cadence.LimitExceededError;
3436
import com.uber.cadence.ListClosedWorkflowExecutionsRequest;
3537
import com.uber.cadence.ListClosedWorkflowExecutionsResponse;
38+
import com.uber.cadence.ListDomainsRequest;
39+
import com.uber.cadence.ListDomainsResponse;
3640
import com.uber.cadence.ListOpenWorkflowExecutionsRequest;
3741
import com.uber.cadence.ListOpenWorkflowExecutionsResponse;
3842
import com.uber.cadence.PollForActivityTaskRequest;
@@ -42,20 +46,25 @@
4246
import com.uber.cadence.QueryFailedError;
4347
import com.uber.cadence.QueryWorkflowRequest;
4448
import com.uber.cadence.QueryWorkflowResponse;
49+
import com.uber.cadence.RecordActivityTaskHeartbeatByIDRequest;
4550
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
4651
import com.uber.cadence.RecordActivityTaskHeartbeatResponse;
4752
import com.uber.cadence.RegisterDomainRequest;
4853
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
54+
import com.uber.cadence.ResetStickyTaskListRequest;
55+
import com.uber.cadence.ResetStickyTaskListResponse;
4956
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
5057
import com.uber.cadence.RespondActivityTaskCanceledRequest;
5158
import com.uber.cadence.RespondActivityTaskCompletedByIDRequest;
5259
import com.uber.cadence.RespondActivityTaskCompletedRequest;
5360
import com.uber.cadence.RespondActivityTaskFailedByIDRequest;
5461
import com.uber.cadence.RespondActivityTaskFailedRequest;
5562
import com.uber.cadence.RespondDecisionTaskCompletedRequest;
63+
import com.uber.cadence.RespondDecisionTaskCompletedResponse;
5664
import com.uber.cadence.RespondDecisionTaskFailedRequest;
5765
import com.uber.cadence.RespondQueryTaskCompletedRequest;
5866
import com.uber.cadence.ServiceBusyError;
67+
import com.uber.cadence.SignalWithStartWorkflowExecutionRequest;
5968
import com.uber.cadence.SignalWorkflowExecutionRequest;
6069
import com.uber.cadence.StartWorkflowExecutionRequest;
6170
import com.uber.cadence.StartWorkflowExecutionResponse;
@@ -221,6 +230,14 @@ public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeat(
221230
return impl.RecordActivityTaskHeartbeat(heartbeatRequest);
222231
}
223232

233+
@Override
234+
public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeatByID(
235+
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest)
236+
throws BadRequestError, InternalServiceError, EntityNotExistsError, DomainNotActiveError,
237+
LimitExceededError, ServiceBusyError, TException {
238+
return impl.RecordActivityTaskHeartbeatByID(heartbeatRequest);
239+
}
240+
224241
@Override
225242
public void RespondActivityTaskCompleted(RespondActivityTaskCompletedRequest completeRequest)
226243
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
@@ -273,6 +290,15 @@ public void SignalWorkflowExecution(SignalWorkflowExecutionRequest signalRequest
273290
impl.SignalWorkflowExecution(signalRequest);
274291
}
275292

293+
@Override
294+
public StartWorkflowExecutionResponse SignalWithStartWorkflowExecution(
295+
SignalWithStartWorkflowExecutionRequest signalWithStartRequest)
296+
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
297+
DomainNotActiveError, LimitExceededError, WorkflowExecutionAlreadyStartedError,
298+
TException {
299+
return impl.SignalWithStartWorkflowExecution(signalWithStartRequest);
300+
}
301+
276302
@Override
277303
public void TerminateWorkflowExecution(TerminateWorkflowExecutionRequest terminateRequest)
278304
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
@@ -302,6 +328,13 @@ public void RespondQueryTaskCompleted(RespondQueryTaskCompletedRequest completeR
302328
impl.RespondQueryTaskCompleted(completeRequest);
303329
}
304330

331+
@Override
332+
public ResetStickyTaskListResponse ResetStickyTaskList(ResetStickyTaskListRequest resetRequest)
333+
throws BadRequestError, InternalServiceError, EntityNotExistsError, LimitExceededError,
334+
ServiceBusyError, DomainNotActiveError, TException {
335+
return impl.ResetStickyTaskList(resetRequest);
336+
}
337+
305338
@Override
306339
public QueryWorkflowResponse QueryWorkflow(QueryWorkflowRequest queryRequest)
307340
throws BadRequestError, InternalServiceError, EntityNotExistsError, QueryFailedError,
@@ -336,6 +369,12 @@ public void DescribeDomain(
336369
impl.DescribeDomain(describeRequest, resultHandler);
337370
}
338371

372+
@Override
373+
public void ListDomains(ListDomainsRequest listRequest, AsyncMethodCallback resultHandler)
374+
throws TException {
375+
impl.ListDomains(listRequest, resultHandler);
376+
}
377+
339378
@Override
340379
public void UpdateDomain(UpdateDomainRequest updateRequest, AsyncMethodCallback resultHandler)
341380
throws TException {
@@ -398,6 +437,13 @@ public void RecordActivityTaskHeartbeat(
398437
impl.RecordActivityTaskHeartbeat(heartbeatRequest, resultHandler);
399438
}
400439

440+
@Override
441+
public void RecordActivityTaskHeartbeatByID(
442+
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest, AsyncMethodCallback resultHandler)
443+
throws TException {
444+
impl.RecordActivityTaskHeartbeatByID(heartbeatRequest, resultHandler);
445+
}
446+
401447
@Override
402448
public void RespondActivityTaskCompleted(
403449
RespondActivityTaskCompletedRequest completeRequest, AsyncMethodCallback resultHandler)
@@ -454,6 +500,14 @@ public void SignalWorkflowExecution(
454500
impl.SignalWorkflowExecution(signalRequest, resultHandler);
455501
}
456502

503+
@Override
504+
public void SignalWithStartWorkflowExecution(
505+
SignalWithStartWorkflowExecutionRequest signalWithStartRequest,
506+
AsyncMethodCallback resultHandler)
507+
throws TException {
508+
impl.SignalWithStartWorkflowExecution(signalWithStartRequest, resultHandler);
509+
}
510+
457511
@Override
458512
public void TerminateWorkflowExecution(
459513
TerminateWorkflowExecutionRequest terminateRequest, AsyncMethodCallback resultHandler)
@@ -482,6 +536,13 @@ public void RespondQueryTaskCompleted(
482536
impl.RespondQueryTaskCompleted(completeRequest, resultHandler);
483537
}
484538

539+
@Override
540+
public void ResetStickyTaskList(
541+
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler)
542+
throws TException {
543+
impl.ResetStickyTaskList(resetRequest, resultHandler);
544+
}
545+
485546
@Override
486547
public void QueryWorkflow(QueryWorkflowRequest queryRequest, AsyncMethodCallback resultHandler)
487548
throws TException {
@@ -513,6 +574,13 @@ public DescribeDomainResponse DescribeDomain(DescribeDomainRequest describeReque
513574
return impl.DescribeDomain(describeRequest);
514575
}
515576

577+
@Override
578+
public ListDomainsResponse ListDomains(ListDomainsRequest listRequest)
579+
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
580+
TException {
581+
return impl.ListDomains(listRequest);
582+
}
583+
516584
@Override
517585
public UpdateDomainResponse UpdateDomain(UpdateDomainRequest updateRequest)
518586
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
@@ -548,9 +616,10 @@ public PollForDecisionTaskResponse PollForDecisionTask(PollForDecisionTaskReques
548616
}
549617

550618
@Override
551-
public void RespondDecisionTaskCompleted(RespondDecisionTaskCompletedRequest completeRequest)
619+
public RespondDecisionTaskCompletedResponse RespondDecisionTaskCompleted(
620+
RespondDecisionTaskCompletedRequest completeRequest)
552621
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
553-
impl.RespondDecisionTaskCompleted(completeRequest);
622+
return impl.RespondDecisionTaskCompleted(completeRequest);
554623
}
555624

556625
@Override

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import com.uber.cadence.PollForActivityTaskResponse;
7272
import com.uber.cadence.PollForDecisionTaskRequest;
7373
import com.uber.cadence.PollForDecisionTaskResponse;
74-
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
7574
import com.uber.cadence.RequestCancelActivityTaskDecisionAttributes;
7675
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
7776
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
@@ -934,11 +933,8 @@ private static void reportActivityTaskCancellation(
934933
}
935934

936935
private static void heartbeatActivityTask(
937-
RequestContext nullCtx,
938-
ActivityTaskData data,
939-
RecordActivityTaskHeartbeatRequest request,
940-
long notUsed) {
941-
data.heartbeatDetails = request.getDetails();
936+
RequestContext nullCtx, ActivityTaskData data, byte[] details, long notUsed) {
937+
data.heartbeatDetails = details;
942938
}
943939

944940
private static void startTimer(

‎src/main/java/com/uber/cadence/internal/testservice/TestWorkflowMutableState.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.uber.cadence.PollForDecisionTaskResponse;
3232
import com.uber.cadence.QueryWorkflowRequest;
3333
import com.uber.cadence.QueryWorkflowResponse;
34-
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
3534
import com.uber.cadence.RecordActivityTaskHeartbeatResponse;
3635
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
3736
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
@@ -114,8 +113,7 @@ void failActivityTask(String activityId, RespondActivityTaskFailedRequest reques
114113
void failActivityTaskById(String id, RespondActivityTaskFailedByIDRequest failRequest)
115114
throws EntityNotExistsError, InternalServiceError, BadRequestError;
116115

117-
RecordActivityTaskHeartbeatResponse heartbeatActivityTask(
118-
String activityId, RecordActivityTaskHeartbeatRequest request)
116+
RecordActivityTaskHeartbeatResponse heartbeatActivityTask(String activityId, byte[] details)
119117
throws InternalServiceError, EntityNotExistsError, BadRequestError;
120118

121119
void signal(SignalWorkflowExecutionRequest signalRequest)

0 commit comments

Comments
 (0)