Skip to content

Commit

Permalink
Updated Thrift and disabled sticky for docker unit tests (#220)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@mfateev
mfateev authored Oct 23, 2018
1 parent f3dae0c commit 50700e7
Show file tree
Hide file tree
Showing 16 changed files with 985 additions and 95 deletions.
3 changes: 3 additions & 0 deletions src/main/java/com/uber/cadence/internal/metrics/ServiceMethod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class ServiceMethod {
MetricsType.CADENCE_METRICS_PREFIX + "DeprecateDomain";
public static final String DESCRIBE_DOMAIN =
MetricsType.CADENCE_METRICS_PREFIX + "DescribeDomain";
public static final String LIST_DOMAINS = MetricsType.CADENCE_METRICS_PREFIX + "ListDomains";
public static final String GET_WORKFLOW_EXECUTION_HISTORY =
MetricsType.CADENCE_METRICS_PREFIX + "GetWorkflowExecutionHistory";
public static final String LIST_CLOSED_WORKFLOW_EXECUTIONS =
Expand Down Expand Up @@ -72,4 +73,6 @@ public class ServiceMethod {
MetricsType.CADENCE_METRICS_PREFIX + "RespondQueryTaskCompleted";
public static final String DESCRIBE_WORKFLOW_EXECUTION =
MetricsType.CADENCE_METRICS_PREFIX + "DescribeWorkflowExecution";
public static final String RESET_STICKY_TASK_LIST =
MetricsType.CADENCE_METRICS_PREFIX + "ResetStickyTaskList";
}
73 changes: 71 additions & 2 deletions src/main/java/com/uber/cadence/internal/sync/TestActivityEnvironmentInternal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@
import com.uber.cadence.DescribeWorkflowExecutionRequest;
import com.uber.cadence.DescribeWorkflowExecutionResponse;
import com.uber.cadence.DomainAlreadyExistsError;
import com.uber.cadence.DomainNotActiveError;
import com.uber.cadence.EntityNotExistsError;
import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
import com.uber.cadence.GetWorkflowExecutionHistoryResponse;
import com.uber.cadence.InternalServiceError;
import com.uber.cadence.LimitExceededError;
import com.uber.cadence.ListClosedWorkflowExecutionsRequest;
import com.uber.cadence.ListClosedWorkflowExecutionsResponse;
import com.uber.cadence.ListDomainsRequest;
import com.uber.cadence.ListDomainsResponse;
import com.uber.cadence.ListOpenWorkflowExecutionsRequest;
import com.uber.cadence.ListOpenWorkflowExecutionsResponse;
import com.uber.cadence.PollForActivityTaskRequest;
Expand All @@ -44,20 +48,25 @@
import com.uber.cadence.QueryFailedError;
import com.uber.cadence.QueryWorkflowRequest;
import com.uber.cadence.QueryWorkflowResponse;
import com.uber.cadence.RecordActivityTaskHeartbeatByIDRequest;
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
import com.uber.cadence.RecordActivityTaskHeartbeatResponse;
import com.uber.cadence.RegisterDomainRequest;
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
import com.uber.cadence.ResetStickyTaskListRequest;
import com.uber.cadence.ResetStickyTaskListResponse;
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
import com.uber.cadence.RespondActivityTaskCanceledRequest;
import com.uber.cadence.RespondActivityTaskCompletedByIDRequest;
import com.uber.cadence.RespondActivityTaskCompletedRequest;
import com.uber.cadence.RespondActivityTaskFailedByIDRequest;
import com.uber.cadence.RespondActivityTaskFailedRequest;
import com.uber.cadence.RespondDecisionTaskCompletedRequest;
import com.uber.cadence.RespondDecisionTaskCompletedResponse;
import com.uber.cadence.RespondDecisionTaskFailedRequest;
import com.uber.cadence.RespondQueryTaskCompletedRequest;
import com.uber.cadence.ServiceBusyError;
import com.uber.cadence.SignalWithStartWorkflowExecutionRequest;
import com.uber.cadence.SignalWorkflowExecutionRequest;
import com.uber.cadence.StartWorkflowExecutionRequest;
import com.uber.cadence.StartWorkflowExecutionResponse;
Expand Down Expand Up @@ -379,6 +388,14 @@ public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeat(
return impl.RecordActivityTaskHeartbeat(heartbeatRequest);
}

@Override
public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeatByID(
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, DomainNotActiveError,
LimitExceededError, ServiceBusyError, TException {
return impl.RecordActivityTaskHeartbeatByID(heartbeatRequest);
}

@Override
public void RespondActivityTaskCompleted(RespondActivityTaskCompletedRequest completeRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
Expand Down Expand Up @@ -431,6 +448,15 @@ public void SignalWorkflowExecution(SignalWorkflowExecutionRequest signalRequest
impl.SignalWorkflowExecution(signalRequest);
}

@Override
public StartWorkflowExecutionResponse SignalWithStartWorkflowExecution(
SignalWithStartWorkflowExecutionRequest signalWithStartRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
DomainNotActiveError, LimitExceededError, WorkflowExecutionAlreadyStartedError,
TException {
return impl.SignalWithStartWorkflowExecution(signalWithStartRequest);
}

@Override
public void TerminateWorkflowExecution(TerminateWorkflowExecutionRequest terminateRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
Expand Down Expand Up @@ -460,6 +486,13 @@ public void RespondQueryTaskCompleted(RespondQueryTaskCompletedRequest completeR
impl.RespondQueryTaskCompleted(completeRequest);
}

@Override
public ResetStickyTaskListResponse ResetStickyTaskList(ResetStickyTaskListRequest resetRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, LimitExceededError,
ServiceBusyError, DomainNotActiveError, TException {
return impl.ResetStickyTaskList(resetRequest);
}

@Override
public QueryWorkflowResponse QueryWorkflow(QueryWorkflowRequest queryRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, QueryFailedError,
Expand Down Expand Up @@ -494,6 +527,12 @@ public void DescribeDomain(
impl.DescribeDomain(describeRequest, resultHandler);
}

@Override
public void ListDomains(ListDomainsRequest listRequest, AsyncMethodCallback resultHandler)
throws TException {
impl.ListDomains(listRequest, resultHandler);
}

@Override
public void UpdateDomain(UpdateDomainRequest updateRequest, AsyncMethodCallback resultHandler)
throws TException {
Expand Down Expand Up @@ -556,6 +595,13 @@ public void RecordActivityTaskHeartbeat(
impl.RecordActivityTaskHeartbeat(heartbeatRequest, resultHandler);
}

@Override
public void RecordActivityTaskHeartbeatByID(
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest, AsyncMethodCallback resultHandler)
throws TException {
impl.RecordActivityTaskHeartbeatByID(heartbeatRequest, resultHandler);
}

@Override
public void RespondActivityTaskCompleted(
RespondActivityTaskCompletedRequest completeRequest, AsyncMethodCallback resultHandler)
Expand Down Expand Up @@ -612,6 +658,14 @@ public void SignalWorkflowExecution(
impl.SignalWorkflowExecution(signalRequest, resultHandler);
}

@Override
public void SignalWithStartWorkflowExecution(
SignalWithStartWorkflowExecutionRequest signalWithStartRequest,
AsyncMethodCallback resultHandler)
throws TException {
impl.SignalWithStartWorkflowExecution(signalWithStartRequest, resultHandler);
}

@Override
public void TerminateWorkflowExecution(
TerminateWorkflowExecutionRequest terminateRequest, AsyncMethodCallback resultHandler)
Expand Down Expand Up @@ -640,6 +694,13 @@ public void RespondQueryTaskCompleted(
impl.RespondQueryTaskCompleted(completeRequest, resultHandler);
}

@Override
public void ResetStickyTaskList(
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler)
throws TException {
impl.ResetStickyTaskList(resetRequest, resultHandler);
}

@Override
public void QueryWorkflow(QueryWorkflowRequest queryRequest, AsyncMethodCallback resultHandler)
throws TException {
Expand Down Expand Up @@ -671,6 +732,13 @@ public DescribeDomainResponse DescribeDomain(DescribeDomainRequest describeReque
return impl.DescribeDomain(describeRequest);
}

@Override
public ListDomainsResponse ListDomains(ListDomainsRequest listRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
TException {
return impl.ListDomains(listRequest);
}

@Override
public UpdateDomainResponse UpdateDomain(UpdateDomainRequest updateRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
Expand Down Expand Up @@ -706,9 +774,10 @@ public PollForDecisionTaskResponse PollForDecisionTask(PollForDecisionTaskReques
}

@Override
public void RespondDecisionTaskCompleted(RespondDecisionTaskCompletedRequest completeRequest)
public RespondDecisionTaskCompletedResponse RespondDecisionTaskCompleted(
RespondDecisionTaskCompletedRequest completeRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
impl.RespondDecisionTaskCompleted(completeRequest);
return impl.RespondDecisionTaskCompleted(completeRequest);
}

@Override
Expand Down
73 changes: 71 additions & 2 deletions src/main/java/com/uber/cadence/internal/sync/TestWorkflowEnvironmentInternal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@
import com.uber.cadence.DescribeWorkflowExecutionRequest;
import com.uber.cadence.DescribeWorkflowExecutionResponse;
import com.uber.cadence.DomainAlreadyExistsError;
import com.uber.cadence.DomainNotActiveError;
import com.uber.cadence.EntityNotExistsError;
import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
import com.uber.cadence.GetWorkflowExecutionHistoryResponse;
import com.uber.cadence.InternalServiceError;
import com.uber.cadence.LimitExceededError;
import com.uber.cadence.ListClosedWorkflowExecutionsRequest;
import com.uber.cadence.ListClosedWorkflowExecutionsResponse;
import com.uber.cadence.ListDomainsRequest;
import com.uber.cadence.ListDomainsResponse;
import com.uber.cadence.ListOpenWorkflowExecutionsRequest;
import com.uber.cadence.ListOpenWorkflowExecutionsResponse;
import com.uber.cadence.PollForActivityTaskRequest;
Expand All @@ -42,20 +46,25 @@
import com.uber.cadence.QueryFailedError;
import com.uber.cadence.QueryWorkflowRequest;
import com.uber.cadence.QueryWorkflowResponse;
import com.uber.cadence.RecordActivityTaskHeartbeatByIDRequest;
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
import com.uber.cadence.RecordActivityTaskHeartbeatResponse;
import com.uber.cadence.RegisterDomainRequest;
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
import com.uber.cadence.ResetStickyTaskListRequest;
import com.uber.cadence.ResetStickyTaskListResponse;
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
import com.uber.cadence.RespondActivityTaskCanceledRequest;
import com.uber.cadence.RespondActivityTaskCompletedByIDRequest;
import com.uber.cadence.RespondActivityTaskCompletedRequest;
import com.uber.cadence.RespondActivityTaskFailedByIDRequest;
import com.uber.cadence.RespondActivityTaskFailedRequest;
import com.uber.cadence.RespondDecisionTaskCompletedRequest;
import com.uber.cadence.RespondDecisionTaskCompletedResponse;
import com.uber.cadence.RespondDecisionTaskFailedRequest;
import com.uber.cadence.RespondQueryTaskCompletedRequest;
import com.uber.cadence.ServiceBusyError;
import com.uber.cadence.SignalWithStartWorkflowExecutionRequest;
import com.uber.cadence.SignalWorkflowExecutionRequest;
import com.uber.cadence.StartWorkflowExecutionRequest;
import com.uber.cadence.StartWorkflowExecutionResponse;
Expand Down Expand Up @@ -221,6 +230,14 @@ public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeat(
return impl.RecordActivityTaskHeartbeat(heartbeatRequest);
}

@Override
public RecordActivityTaskHeartbeatResponse RecordActivityTaskHeartbeatByID(
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, DomainNotActiveError,
LimitExceededError, ServiceBusyError, TException {
return impl.RecordActivityTaskHeartbeatByID(heartbeatRequest);
}

@Override
public void RespondActivityTaskCompleted(RespondActivityTaskCompletedRequest completeRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
Expand Down Expand Up @@ -273,6 +290,15 @@ public void SignalWorkflowExecution(SignalWorkflowExecutionRequest signalRequest
impl.SignalWorkflowExecution(signalRequest);
}

@Override
public StartWorkflowExecutionResponse SignalWithStartWorkflowExecution(
SignalWithStartWorkflowExecutionRequest signalWithStartRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
DomainNotActiveError, LimitExceededError, WorkflowExecutionAlreadyStartedError,
TException {
return impl.SignalWithStartWorkflowExecution(signalWithStartRequest);
}

@Override
public void TerminateWorkflowExecution(TerminateWorkflowExecutionRequest terminateRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
Expand Down Expand Up @@ -302,6 +328,13 @@ public void RespondQueryTaskCompleted(RespondQueryTaskCompletedRequest completeR
impl.RespondQueryTaskCompleted(completeRequest);
}

@Override
public ResetStickyTaskListResponse ResetStickyTaskList(ResetStickyTaskListRequest resetRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, LimitExceededError,
ServiceBusyError, DomainNotActiveError, TException {
return impl.ResetStickyTaskList(resetRequest);
}

@Override
public QueryWorkflowResponse QueryWorkflow(QueryWorkflowRequest queryRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, QueryFailedError,
Expand Down Expand Up @@ -336,6 +369,12 @@ public void DescribeDomain(
impl.DescribeDomain(describeRequest, resultHandler);
}

@Override
public void ListDomains(ListDomainsRequest listRequest, AsyncMethodCallback resultHandler)
throws TException {
impl.ListDomains(listRequest, resultHandler);
}

@Override
public void UpdateDomain(UpdateDomainRequest updateRequest, AsyncMethodCallback resultHandler)
throws TException {
Expand Down Expand Up @@ -398,6 +437,13 @@ public void RecordActivityTaskHeartbeat(
impl.RecordActivityTaskHeartbeat(heartbeatRequest, resultHandler);
}

@Override
public void RecordActivityTaskHeartbeatByID(
RecordActivityTaskHeartbeatByIDRequest heartbeatRequest, AsyncMethodCallback resultHandler)
throws TException {
impl.RecordActivityTaskHeartbeatByID(heartbeatRequest, resultHandler);
}

@Override
public void RespondActivityTaskCompleted(
RespondActivityTaskCompletedRequest completeRequest, AsyncMethodCallback resultHandler)
Expand Down Expand Up @@ -454,6 +500,14 @@ public void SignalWorkflowExecution(
impl.SignalWorkflowExecution(signalRequest, resultHandler);
}

@Override
public void SignalWithStartWorkflowExecution(
SignalWithStartWorkflowExecutionRequest signalWithStartRequest,
AsyncMethodCallback resultHandler)
throws TException {
impl.SignalWithStartWorkflowExecution(signalWithStartRequest, resultHandler);
}

@Override
public void TerminateWorkflowExecution(
TerminateWorkflowExecutionRequest terminateRequest, AsyncMethodCallback resultHandler)
Expand Down Expand Up @@ -482,6 +536,13 @@ public void RespondQueryTaskCompleted(
impl.RespondQueryTaskCompleted(completeRequest, resultHandler);
}

@Override
public void ResetStickyTaskList(
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler)
throws TException {
impl.ResetStickyTaskList(resetRequest, resultHandler);
}

@Override
public void QueryWorkflow(QueryWorkflowRequest queryRequest, AsyncMethodCallback resultHandler)
throws TException {
Expand Down Expand Up @@ -513,6 +574,13 @@ public DescribeDomainResponse DescribeDomain(DescribeDomainRequest describeReque
return impl.DescribeDomain(describeRequest);
}

@Override
public ListDomainsResponse ListDomains(ListDomainsRequest listRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, ServiceBusyError,
TException {
return impl.ListDomains(listRequest);
}

@Override
public UpdateDomainResponse UpdateDomain(UpdateDomainRequest updateRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
Expand Down Expand Up @@ -548,9 +616,10 @@ public PollForDecisionTaskResponse PollForDecisionTask(PollForDecisionTaskReques
}

@Override
public void RespondDecisionTaskCompleted(RespondDecisionTaskCompletedRequest completeRequest)
public RespondDecisionTaskCompletedResponse RespondDecisionTaskCompleted(
RespondDecisionTaskCompletedRequest completeRequest)
throws BadRequestError, InternalServiceError, EntityNotExistsError, TException {
impl.RespondDecisionTaskCompleted(completeRequest);
return impl.RespondDecisionTaskCompleted(completeRequest);
}

@Override
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/com/uber/cadence/internal/testservice/StateMachines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
import com.uber.cadence.PollForActivityTaskResponse;
import com.uber.cadence.PollForDecisionTaskRequest;
import com.uber.cadence.PollForDecisionTaskResponse;
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
import com.uber.cadence.RequestCancelActivityTaskDecisionAttributes;
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
Expand Down Expand Up @@ -934,11 +933,8 @@ private static void reportActivityTaskCancellation(
}

private static void heartbeatActivityTask(
RequestContext nullCtx,
ActivityTaskData data,
RecordActivityTaskHeartbeatRequest request,
long notUsed) {
data.heartbeatDetails = request.getDetails();
RequestContext nullCtx, ActivityTaskData data, byte[] details, long notUsed) {
data.heartbeatDetails = details;
}

private static void startTimer(
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/uber/cadence/internal/testservice/TestWorkflowMutableState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.uber.cadence.PollForDecisionTaskResponse;
import com.uber.cadence.QueryWorkflowRequest;
import com.uber.cadence.QueryWorkflowResponse;
import com.uber.cadence.RecordActivityTaskHeartbeatRequest;
import com.uber.cadence.RecordActivityTaskHeartbeatResponse;
import com.uber.cadence.RequestCancelWorkflowExecutionRequest;
import com.uber.cadence.RespondActivityTaskCanceledByIDRequest;
Expand Down Expand Up @@ -114,8 +113,7 @@ void failActivityTask(String activityId, RespondActivityTaskFailedRequest reques
void failActivityTaskById(String id, RespondActivityTaskFailedByIDRequest failRequest)
throws EntityNotExistsError, InternalServiceError, BadRequestError;

RecordActivityTaskHeartbeatResponse heartbeatActivityTask(
String activityId, RecordActivityTaskHeartbeatRequest request)
RecordActivityTaskHeartbeatResponse heartbeatActivityTask(String activityId, byte[] details)
throws InternalServiceError, EntityNotExistsError, BadRequestError;

void signal(SignalWorkflowExecutionRequest signalRequest)
Expand Down
Loading

0 comments on commit 50700e7

Please sign in to comment.