Pass retry policy when completing with continue as new (#995)

Co-authored-by: Bowei Xu <[email protected]>
cadence-workflow · Jul 13, 2020 · 3ac9595 · 3ac9595
1 parent 294cc54
commit 3ac9595
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/internal/internal_task_handlers.go b/internal/internal_task_handlers.go
@@ -629,6 +629,7 @@ func (wth *workflowTaskHandlerImpl) createWorkflowContext(task *s.PollForDecisio
 		ParentWorkflowExecution:             parentWorkflowExecution,
 		Memo:                                attributes.Memo,
 		SearchAttributes:                    attributes.SearchAttributes,
+		RetryPolicy:                         attributes.RetryPolicy,
 	}
 
 	wfStartTime := time.Unix(0, h.Events[0].GetTimestamp())
@@ -1497,6 +1498,7 @@ func (wth *workflowTaskHandlerImpl) completeWorkflow(
 			Header:                              contErr.params.header,
 			Memo:                                workflowContext.workflowInfo.Memo,
 			SearchAttributes:                    workflowContext.workflowInfo.SearchAttributes,
+			RetryPolicy:                         workflowContext.workflowInfo.RetryPolicy,
 		}
 	} else if workflowContext.err != nil {
 		// Workflow failures

diff --git a/internal/internal_task_handlers_test.go b/internal/internal_task_handlers_test.go
@@ -858,6 +858,12 @@ func (t *TaskHandlersTestSuite) TestGetWorkflowInfo() {
 	workflowType := "GetWorkflowInfoWorkflow"
 	lastCompletionResult, err := getDefaultDataConverter().ToData("lastCompletionData")
 	t.NoError(err)
+	retryPolicy := &s.RetryPolicy{
+		InitialIntervalInSeconds: common.Int32Ptr(1),
+		BackoffCoefficient:       common.Float64Ptr(1.0),
+		MaximumIntervalInSeconds: common.Int32Ptr(1),
+		MaximumAttempts:          common.Int32Ptr(3),
+	}
 	startedEventAttributes := &s.WorkflowExecutionStartedEventAttributes{
 		Input:                               lastCompletionResult,
 		TaskList:                            &s.TaskList{Name: &taskList},
@@ -869,6 +875,7 @@ func (t *TaskHandlersTestSuite) TestGetWorkflowInfo() {
 		ExecutionStartToCloseTimeoutSeconds: &executionTimeout,
 		TaskStartToCloseTimeoutSeconds:      &taskTimeout,
 		LastCompletionResult:                lastCompletionResult,
+		RetryPolicy:                         retryPolicy,
 	}
 	testEvents := []*s.HistoryEvent{
 		createTestEventWorkflowExecutionStarted(1, startedEventAttributes),
@@ -904,6 +911,7 @@ func (t *TaskHandlersTestSuite) TestGetWorkflowInfo() {
 	t.EqualValues(taskTimeout, result.TaskStartToCloseTimeoutSeconds)
 	t.EqualValues(workflowType, result.WorkflowType.Name)
 	t.EqualValues(testDomain, result.Domain)
+	t.EqualValues(retryPolicy, result.RetryPolicy)
 }
 
 func (t *TaskHandlersTestSuite) TestConsistentQuery_InvalidQueryTask() {

diff --git a/internal/workflow.go b/internal/workflow.go
@@ -741,6 +741,7 @@ type WorkflowInfo struct {
 	Memo                                *s.Memo             // Value can be decoded using data converter (DefaultDataConverter, or custom one if set).
 	SearchAttributes                    *s.SearchAttributes // Value can be decoded using DefaultDataConverter.
 	BinaryChecksum                      *string
+	RetryPolicy                         *s.RetryPolicy
 }
 
 func (wInfo *WorkflowInfo) GetBinaryChecksum() string {