Fix non-deterministic error when resetting a parent workflow with a c…

…hild workflow Includes the following change from cadence: uber-go/cadence-client#1118 Fixes the following community issue: : temporalio#723
arithran · Jul 22, 2024 · ee34197 · ee34197
1 parent 1350fb4
commit ee34197
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/internal_event_handlers.go b/internal/internal_event_handlers.go
@@ -553,7 +553,11 @@ func (wc *workflowEnvironmentImpl) ExecuteChildWorkflow(
 	params ExecuteWorkflowParams, callback ResultHandler, startedHandler func(r WorkflowExecution, e error),
 ) {
 	if params.WorkflowID == "" {
-		params.WorkflowID = wc.workflowInfo.WorkflowExecution.RunID + "_" + wc.GenerateSequenceID()
+		if wc.workflowInfo.OriginalRunID != "" {
+			params.WorkflowID = wc.workflowInfo.OriginalRunID + "_" + wc.GenerateSequenceID()
+		} else {
+			params.WorkflowID = wc.workflowInfo.WorkflowExecution.RunID + "_" + wc.GenerateSequenceID()
+		}
 	}
 	memo, err := getWorkflowMemo(params.Memo, wc.dataConverter)
 	if err != nil {