ChildWorkflow defaults to workflow run timeout specified by parent (#566)

Author: samarabbas

host/integration_test.go

@@ -1845,6 +1845,8 @@ func (s *integrationSuite) TestChildWorkflowExecution() {
 	s.Equal(header, childStartedEvent.GetWorkflowExecutionStartedEventAttributes().Header)
 	s.Equal(memo, childStartedEvent.GetWorkflowExecutionStartedEventAttributes().GetMemo())
 	s.Equal(searchAttr, childStartedEvent.GetWorkflowExecutionStartedEventAttributes().GetSearchAttributes())
+	s.Equal(int32(315360000), childStartedEvent.GetWorkflowExecutionStartedEventAttributes().GetWorkflowExecutionTimeoutSeconds())
+	s.Equal(int32(200), childStartedEvent.GetWorkflowExecutionStartedEventAttributes().GetWorkflowRunTimeoutSeconds())
 
 	// Process ChildExecution completed event and complete parent execution
 	_, err = pollerParent.PollAndProcessWorkflowTask(false, false)

service/history/commandChecker.go

@@ -51,6 +51,7 @@ import (
 type (
 	commandAttrValidator struct {
 		namespaceCache            cache.NamespaceCache
+		config                    *Config
 		maxIDLengthLimit          int
 		searchAttributesValidator *validator.SearchAttributesValidator
 	}
@@ -84,6 +85,7 @@ func newCommandAttrValidator(
 ) *commandAttrValidator {
 	return &commandAttrValidator{
 		namespaceCache:   namespaceCache,
+		config:           config,
 		maxIDLengthLimit: config.MaxIDLengthLimit(),
 		searchAttributesValidator: validator.NewSearchAttributesValidator(
 			logger,
@@ -546,6 +548,7 @@ func (v *commandAttrValidator) validateContinueAsNewWorkflowExecutionAttributes(
 func (v *commandAttrValidator) validateStartChildExecutionAttributes(
 	namespaceID string,
 	targetNamespaceID string,
+	targetNamespace string,
 	attributes *commandpb.StartChildWorkflowExecutionCommandAttributes,
 	parentInfo *persistence.WorkflowExecutionInfo,
 ) error {
@@ -596,15 +599,11 @@ func (v *commandAttrValidator) validateStartChildExecutionAttributes(
 	}
 	attributes.TaskQueue = taskQueue
 
-	// Inherit workflow timeout from parent workflow execution if not provided on command
-	if attributes.GetWorkflowExecutionTimeoutSeconds() <= 0 {
-		attributes.WorkflowExecutionTimeoutSeconds = parentInfo.WorkflowExecutionTimeout
-	}
+	attributes.WorkflowExecutionTimeoutSeconds = getWorkflowExecutionTimeout(targetNamespace,
+		attributes.GetWorkflowExecutionTimeoutSeconds(), v.config)
 
-	// Inherit workflow timeout from parent workflow execution if not provided on command
-	if attributes.GetWorkflowRunTimeoutSeconds() <= 0 {
-		attributes.WorkflowRunTimeoutSeconds = parentInfo.WorkflowRunTimeout
-	}
+	attributes.WorkflowRunTimeoutSeconds = getWorkflowRunTimeout(targetNamespace,
+		attributes.GetWorkflowRunTimeoutSeconds(), attributes.GetWorkflowExecutionTimeoutSeconds(), v.config)
 
 	// Inherit workflow task timeout from parent workflow execution if not provided on command
 	if attributes.GetWorkflowTaskTimeoutSeconds() <= 0 {

service/history/historyEngine.go

@@ -2657,13 +2657,7 @@ func (e *historyEngineImpl) overrideStartWorkflowExecutionRequest(
 	metricsScope int,
 ) {
 	namespace := namespaceEntry.GetInfo().Name
-
-	executionTimeoutSeconds := request.GetWorkflowExecutionTimeoutSeconds()
-	if executionTimeoutSeconds == 0 {
-		executionTimeoutSeconds = convert.Int32Ceil(e.config.DefaultWorkflowExecutionTimeout(namespace).Seconds())
-	}
-	maxWorkflowExecutionTimeout := convert.Int32Ceil(e.config.MaxWorkflowExecutionTimeout(namespace).Seconds())
-	executionTimeoutSeconds = common.MinInt32(executionTimeoutSeconds, maxWorkflowExecutionTimeout)
+	executionTimeoutSeconds := getWorkflowExecutionTimeout(namespace, request.GetWorkflowExecutionTimeoutSeconds(), e.config)
 	if executionTimeoutSeconds != request.GetWorkflowExecutionTimeoutSeconds() {
 		request.WorkflowExecutionTimeoutSeconds = executionTimeoutSeconds
 		e.metricsClient.Scope(
@@ -2672,13 +2666,8 @@ func (e *historyEngineImpl) overrideStartWorkflowExecutionRequest(
 		).IncCounter(metrics.WorkflowExecutionTimeoutOverrideCount)
 	}
 
-	runTimeoutSeconds := request.GetWorkflowRunTimeoutSeconds()
-	if runTimeoutSeconds == 0 {
-		runTimeoutSeconds = convert.Int32Ceil(e.config.DefaultWorkflowRunTimeout(namespace).Seconds())
-	}
-	maxWorkflowRunTimeout := convert.Int32Ceil(e.config.MaxWorkflowRunTimeout(namespace).Seconds())
-	runTimeoutSeconds = common.MinInt32(runTimeoutSeconds, maxWorkflowRunTimeout)
-	runTimeoutSeconds = common.MinInt32(runTimeoutSeconds, executionTimeoutSeconds)
+	runTimeoutSeconds := getWorkflowRunTimeout(namespace, request.GetWorkflowRunTimeoutSeconds(),
+		executionTimeoutSeconds, e.config)
 	if runTimeoutSeconds != request.GetWorkflowRunTimeoutSeconds() {
 		request.WorkflowRunTimeoutSeconds = runTimeoutSeconds
 		e.metricsClient.Scope(

service/history/workflowExecutionUtil.go

@@ -31,6 +31,7 @@ import (
 	"go.temporal.io/api/serviceerror"
 
 	"go.temporal.io/server/common"
+	"go.temporal.io/server/common/convert"
 )
 
 type workflowContext interface {
@@ -222,3 +223,26 @@ func terminateWorkflow(
 	)
 	return err
 }
+
+func getWorkflowExecutionTimeout(namespace string, requestedTimeout int32, serviceConfig *Config) int32 {
+	executionTimeoutSeconds := requestedTimeout
+	if executionTimeoutSeconds == 0 {
+		executionTimeoutSeconds = convert.Int32Ceil(serviceConfig.DefaultWorkflowExecutionTimeout(namespace).Seconds())
+	}
+	maxWorkflowExecutionTimeout := convert.Int32Ceil(serviceConfig.MaxWorkflowExecutionTimeout(namespace).Seconds())
+	executionTimeoutSeconds = common.MinInt32(executionTimeoutSeconds, maxWorkflowExecutionTimeout)
+
+	return executionTimeoutSeconds
+}
+
+func getWorkflowRunTimeout(namespace string, requestedTimeout, executionTimeout int32, serviceConfig *Config) int32 {
+	runTimeoutSeconds := requestedTimeout
+	if runTimeoutSeconds == 0 {
+		runTimeoutSeconds = convert.Int32Ceil(serviceConfig.DefaultWorkflowRunTimeout(namespace).Seconds())
+	}
+	maxWorkflowRunTimeout := convert.Int32Ceil(serviceConfig.MaxWorkflowRunTimeout(namespace).Seconds())
+	runTimeoutSeconds = common.MinInt32(runTimeoutSeconds, maxWorkflowRunTimeout)
+	runTimeoutSeconds = common.MinInt32(runTimeoutSeconds, executionTimeout)
+
+	return runTimeoutSeconds
+}

service/history/workflowTaskHandler.go

@@ -726,12 +726,15 @@ func (handler *workflowTaskHandlerImpl) handleCommandStartChildWorkflow(
 
 	executionInfo := handler.mutableState.GetExecutionInfo()
 	namespaceID := executionInfo.NamespaceID
+	parentNamespace := handler.namespaceEntry.GetInfo().GetName()
 	targetNamespaceID := namespaceID
+	targetNamespace := parentNamespace
 	if attr.GetNamespace() != "" {
 		targetNamespaceEntry, err := handler.namespaceCache.GetNamespace(attr.GetNamespace())
 		if err != nil {
 			return serviceerror.NewInternal(fmt.Sprintf("Unable to schedule child execution across namespace %v.", attr.GetNamespace()))
 		}
+		targetNamespace = targetNamespaceEntry.GetInfo().Name
 		targetNamespaceID = targetNamespaceEntry.GetInfo().Id
 	}
 
@@ -740,6 +743,7 @@ func (handler *workflowTaskHandlerImpl) handleCommandStartChildWorkflow(
 			return handler.attrValidator.validateStartChildExecutionAttributes(
 				namespaceID,
 				targetNamespaceID,
+				targetNamespace,
 				attr,
 				executionInfo,
 			)