Remove unused default IDReusePolicy for SignalWithStart (cadence-work…

…flow#3229)
mkolodezny · May 11, 2020 · c14d8ab · c14d8ab
1 parent a38395d
commit c14d8ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -581,17 +581,10 @@ func (e *historyEngineImpl) startWorkflowHelper(
 				prevLastWriteVersion,
 			)
 		}
-		// for signalWithStart, WorkflowIDReusePolicy is default to WorkflowIDReusePolicyAllowDuplicate
-		// while for startWorkflow it is default to WorkflowIdReusePolicyAllowDuplicateFailedOnly.
-		policy := workflow.WorkflowIdReusePolicyAllowDuplicate
-		if request.WorkflowIdReusePolicy != nil {
-			policy = request.GetWorkflowIdReusePolicy()
-		}
-
 		err = e.applyWorkflowIDReusePolicyForSigWithStart(
 			prevMutableState.GetExecutionInfo(),
 			workflowExecution,
-			policy,
+			request.GetWorkflowIdReusePolicy(),
 		)
 		if err != nil {
 			return nil, err
@@ -2850,7 +2843,6 @@ func getStartRequest(
 	return startRequest
 }
 
-// for startWorkflowExecution & signalWithStart to handle workflow reuse policy
 func (e *historyEngineImpl) applyWorkflowIDReusePolicyForSigWithStart(
 	prevExecutionInfo *persistence.WorkflowExecutionInfo,
 	execution workflow.WorkflowExecution,

diff --git a/service/history/historyEngine2_test.go b/service/history/historyEngine2_test.go
@@ -1283,6 +1283,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_WorkflowNotRunning()
 	signalName := "my signal name"
 	input := []byte("test input")
 	requestID := uuid.New()
+	policy := workflow.WorkflowIdReusePolicyAllowDuplicate
 	sRequest = &h.SignalWithStartWorkflowExecutionRequest{
 		DomainUUID: common.StringPtr(domainID),
 		SignalWithStartRequest: &workflow.SignalWithStartWorkflowExecutionRequest{
@@ -1296,6 +1297,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_WorkflowNotRunning()
 			SignalName:                          common.StringPtr(signalName),
 			Input:                               input,
 			RequestId:                           common.StringPtr(requestID),
+			WorkflowIdReusePolicy:               &policy,
 		},
 	}
 
@@ -1327,6 +1329,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_Start_DuplicateReque
 	signalName := "my signal name"
 	input := []byte("test input")
 	requestID := "testRequestID"
+	policy := workflow.WorkflowIdReusePolicyAllowDuplicate
 	sRequest := &h.SignalWithStartWorkflowExecutionRequest{
 		DomainUUID: common.StringPtr(domainID),
 		SignalWithStartRequest: &workflow.SignalWithStartWorkflowExecutionRequest{
@@ -1340,6 +1343,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_Start_DuplicateReque
 			SignalName:                          common.StringPtr(signalName),
 			Input:                               input,
 			RequestId:                           common.StringPtr(requestID),
+			WorkflowIdReusePolicy:               &policy,
 		},
 	}
 
@@ -1379,6 +1383,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_Start_WorkflowAlread
 	signalName := "my signal name"
 	input := []byte("test input")
 	requestID := "testRequestID"
+	policy := workflow.WorkflowIdReusePolicyAllowDuplicate
 	sRequest := &h.SignalWithStartWorkflowExecutionRequest{
 		DomainUUID: common.StringPtr(domainID),
 		SignalWithStartRequest: &workflow.SignalWithStartWorkflowExecutionRequest{
@@ -1392,6 +1397,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_Start_WorkflowAlread
 			SignalName:                          common.StringPtr(signalName),
 			Input:                               input,
 			RequestId:                           common.StringPtr(requestID),
+			WorkflowIdReusePolicy:               &policy,
 		},
 	}