Handle workflow already completed when verifying first workflow task …

…scheduled (#3061)
temporalio · Jul 8, 2022 · 6737693 · 6737693
1 parent 12c173c
commit 6737693
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/service/history/transferQueueStandbyTaskExecutor.go b/service/history/transferQueueStandbyTaskExecutor.go
@@ -295,6 +295,8 @@ func (t *transferQueueStandbyTaskExecutor) processCloseExecution(
 			})
 			switch err.(type) {
 			case nil, *serviceerror.NotFound, *serviceerror.NamespaceNotFound, *serviceerror.Unimplemented:
+				// NOTE: NotFound is only returned when workflow already completed
+				// If workflow can't be found at all, WorkflowNotReady error will be returned.
 				return nil, nil
 			case *serviceerror.WorkflowNotReady:
 				return verifyChildCompletionRecordedInfo, nil
@@ -448,7 +450,9 @@ func (t *transferQueueStandbyTaskExecutor) processStartChildExecution(
 			Clock: childWorkflowInfo.Clock,
 		})
 		switch err.(type) {
-		case nil, *serviceerror.NamespaceNotFound, *serviceerror.Unimplemented:
+		case nil, *serviceerror.NotFound, *serviceerror.NamespaceNotFound, *serviceerror.Unimplemented:
+			// NOTE: NotFound is only returned when workflow already completed
+			// If workflow can't be found at all, WorkflowNotReady error will be returned.
 			return nil, nil
 		case *serviceerror.WorkflowNotReady:
 			return &startChildExecutionPostActionInfo{}, nil

diff --git a/service/history/transferQueueStandbyTaskExecutor_test.go b/service/history/transferQueueStandbyTaskExecutor_test.go
@@ -1054,7 +1054,11 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_P
 	_, err = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask))
 	s.Nil(err)
 
-	s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, &serviceerror.WorkflowNotReady{})
+	s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, consts.ErrWorkflowCompleted)
+	_, err = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask))
+	s.Nil(err)
+
+	s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, consts.ErrWorkflowNotReady)
 	_, err = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask))
 	s.Equal(consts.ErrTaskRetry, err)