Fix start workflow execution expiration time (cadence-workflow#3371)

fengwk · Jul 6, 2020 · f8c60c1 · f8c60c1
1 parent 6a238a7
commit f8c60c1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 5 deletions.
diff --git a/common/util.go b/common/util.go
@@ -413,12 +413,14 @@ func CreateHistoryStartWorkflowRequest(
 		DomainUUID:   StringPtr(domainID),
 		StartRequest: startRequest,
 	}
+	firstDecisionTaskBackoffSeconds := backoff.GetBackoffForNextScheduleInSeconds(startRequest.GetCronSchedule(), now, now)
 	if startRequest.RetryPolicy != nil && startRequest.RetryPolicy.GetExpirationIntervalInSeconds() > 0 {
-		expirationInSeconds := startRequest.RetryPolicy.GetExpirationIntervalInSeconds()
-		deadline := now.Add(time.Second * time.Duration(expirationInSeconds))
+		expirationInSeconds := startRequest.RetryPolicy.GetExpirationIntervalInSeconds() + firstDecisionTaskBackoffSeconds
+		// expirationTime calculates from first decision task schedule to the end of the workflow
+		deadline := now.Add(time.Duration(expirationInSeconds) * time.Second)
 		histRequest.ExpirationTimestamp = Int64Ptr(deadline.Round(time.Millisecond).UnixNano())
 	}
-	histRequest.FirstDecisionTaskBackoffSeconds = Int32Ptr(backoff.GetBackoffForNextScheduleInSeconds(startRequest.GetCronSchedule(), now, now))
+	histRequest.FirstDecisionTaskBackoffSeconds = Int32Ptr(firstDecisionTaskBackoffSeconds)
 	return histRequest
 }
 

diff --git a/common/util_test.go b/common/util_test.go
@@ -28,7 +28,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pborman/uuid"
 	"github.com/stretchr/testify/require"
+
+	workflow "github.com/uber/cadence/.gen/go/shared"
 )
 
 func TestIsServiceTransientError_ContextTimeout(t *testing.T) {
@@ -58,3 +61,38 @@ func TestConvertDynamicConfigMapPropertyToIntMap(t *testing.T) {
 		require.Equal(t, i, intMap[i])
 	}
 }
+
+func TestCreateHistoryStartWorkflowRequest_ExpirationTimeWithCron(t *testing.T) {
+	domainId := uuid.New()
+	request := &workflow.StartWorkflowExecutionRequest{
+		RetryPolicy:                         &workflow.RetryPolicy{
+			InitialIntervalInSeconds:    Int32Ptr(60),
+			ExpirationIntervalInSeconds: Int32Ptr(60),
+		},
+		CronSchedule:                        StringPtr("@every 300s"),
+	}
+	now := time.Now()
+	startRequest := CreateHistoryStartWorkflowRequest(domainId, request)
+
+	expirationTime := startRequest.GetExpirationTimestamp()
+	require.NotNil(t, expirationTime)
+	require.True(t, time.Unix(0, expirationTime).Sub(now) > 60 * time.Second)
+}
+
+func TestCreateHistoryStartWorkflowRequest_ExpirationTimeWithoutCron(t *testing.T) {
+	domainId := uuid.New()
+	request := &workflow.StartWorkflowExecutionRequest{
+		RetryPolicy:                         &workflow.RetryPolicy{
+			InitialIntervalInSeconds:    Int32Ptr(60),
+			ExpirationIntervalInSeconds: Int32Ptr(60),
+		},
+	}
+	now := time.Now()
+	startRequest := CreateHistoryStartWorkflowRequest(domainId, request)
+
+	expirationTime := startRequest.GetExpirationTimestamp()
+	require.NotNil(t, expirationTime)
+	delta := time.Unix(0, expirationTime).Sub(now)
+	require.True(t, delta > 58 * time.Second)
+	require.True(t, delta < 62 * time.Second)
+}
diff --git a/service/history/task/timer_active_task_executor.go b/service/history/task/timer_active_task_executor.go
@@ -496,7 +496,7 @@ func (t *timerActiveTaskExecutor) executeWorkflowTimeoutTask(
 	}
 
 	startAttributes := startEvent.WorkflowExecutionStartedEventAttributes
-	continueAsnewAttributes := &workflow.ContinueAsNewWorkflowExecutionDecisionAttributes{
+	continueAsNewAttributes := &workflow.ContinueAsNewWorkflowExecutionDecisionAttributes{
 		WorkflowType:                        startAttributes.WorkflowType,
 		TaskList:                            startAttributes.TaskList,
 		Input:                               startAttributes.Input,
@@ -515,7 +515,7 @@ func (t *timerActiveTaskExecutor) executeWorkflowTimeoutTask(
 		mutableState,
 		eventBatchFirstEventID,
 		startAttributes.GetParentWorkflowDomain(),
-		continueAsnewAttributes,
+		continueAsNewAttributes,
 	)
 	if err != nil {
 		return err