Fix execute workflow causing frequent context timeout (#484)

Author: vancexu

src/main/java/com/uber/cadence/internal/common/WorkflowExecutionUtils.java

@@ -289,6 +289,7 @@ private static CompletableFuture<HistoryEvent> getInstanceCloseEventAsync(
     request.setDomain(domain);
     request.setExecution(workflowExecution);
     request.setHistoryEventFilterType(HistoryEventFilterType.CLOSE_EVENT);
+    request.setWaitForNewEvent(true);
     request.setNextPageToken(pageToken);
     CompletableFuture<GetWorkflowExecutionHistoryResponse> response =
         getWorkflowExecutionHistoryAsync(service, request);

src/main/java/com/uber/cadence/serviceclient/WorkflowServiceTChannel.java

@@ -834,20 +834,8 @@ private GetWorkflowExecutionHistoryResponse getWorkflowExecutionHistory(
       GetWorkflowExecutionHistoryRequest getRequest) throws TException {
     ThriftResponse<WorkflowService.GetWorkflowExecutionHistory_result> response = null;
     try {
-      ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args> request;
-      if (getRequest.isWaitForNewEvent()) {
-        request =
-            buildThriftRequest(
-                "GetWorkflowExecutionHistory",
-                new WorkflowService.GetWorkflowExecutionHistory_args(getRequest),
-                options.getRpcLongPollTimeoutMillis());
-      } else {
-        request =
-            buildThriftRequest(
-                "GetWorkflowExecutionHistory",
-                new WorkflowService.GetWorkflowExecutionHistory_args(getRequest));
-      }
-
+      ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args> request =
+          buildGetWorkflowExecutionHistoryThriftRequest(getRequest);
       response = doRemoteCall(request);
       WorkflowService.GetWorkflowExecutionHistory_result result =
           response.getBody(WorkflowService.GetWorkflowExecutionHistory_result.class);
@@ -881,6 +869,24 @@ private GetWorkflowExecutionHistoryResponse getWorkflowExecutionHistory(
     }
   }
 
+  private ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args>
+      buildGetWorkflowExecutionHistoryThriftRequest(GetWorkflowExecutionHistoryRequest getRequest) {
+    ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args> request;
+    if (getRequest.isWaitForNewEvent()) {
+      request =
+          buildThriftRequest(
+              "GetWorkflowExecutionHistory",
+              new WorkflowService.GetWorkflowExecutionHistory_args(getRequest),
+              options.getRpcLongPollTimeoutMillis());
+    } else {
+      request =
+          buildThriftRequest(
+              "GetWorkflowExecutionHistory",
+              new WorkflowService.GetWorkflowExecutionHistory_args(getRequest));
+    }
+    return request;
+  }
+
   @Override
   public PollForDecisionTaskResponse PollForDecisionTask(PollForDecisionTaskRequest request)
       throws TException {
@@ -2298,9 +2304,7 @@ public void GetWorkflowExecutionHistory(
     CompletableFuture<ThriftResponse<GetWorkflowExecutionHistory_result>> response = null;
     try {
       ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args> request =
-          buildThriftRequest(
-              "GetWorkflowExecutionHistory",
-              new WorkflowService.GetWorkflowExecutionHistory_args(getRequest));
+          buildGetWorkflowExecutionHistoryThriftRequest(getRequest);
       response = doRemoteCallAsync(request);
 
       response