Patch to fix childWF decision panic after reset

uber-go · Aug 14, 2021 · 057125c · 057125c
1 parent 3b485bd
commit 057125c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/internal/internal_event_handlers.go b/internal/internal_event_handlers.go
@@ -374,7 +374,12 @@ func (wc *workflowEnvironmentImpl) RegisterCancelHandler(handler func()) {
 func (wc *workflowEnvironmentImpl) ExecuteChildWorkflow(
 	params executeWorkflowParams, callback resultHandler, startedHandler func(r WorkflowExecution, e error)) 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 {

diff --git a/internal/internal_task_handlers.go b/internal/internal_task_handlers.go
@@ -616,6 +616,7 @@ func (wth *workflowTaskHandlerImpl) createWorkflowContext(task *s.PollForDecisio
 			ID:    workflowID,
 			RunID: runID,
 		},
+		OriginalRunId:                       attributes.GetOriginalExecutionRunId(),
 		WorkflowType:                        flowWorkflowTypeFrom(*task.WorkflowType),
 		TaskListName:                        taskList.GetName(),
 		ExecutionStartToCloseTimeoutSeconds: attributes.GetExecutionStartToCloseTimeoutSeconds(),

diff --git a/internal/workflow.go b/internal/workflow.go
@@ -727,6 +727,7 @@ func getWorkflowHeader(ctx Context, ctxProps []ContextPropagator) *s.Header {
 // WorkflowInfo information about currently executing workflow
 type WorkflowInfo struct {
 	WorkflowExecution                   WorkflowExecution
+	OriginalRunId                       string //This is the runID when the WorkflowExecutionStarted event is written
 	WorkflowType                        WorkflowType
 	TaskListName                        string
 	ExecutionStartToCloseTimeoutSeconds int32