not setting IsParent on ArrayNode unless new eventing scheme (#4967)

Signed-off-by: Daniel Rammer <[email protected]>
flyteorg · Feb 28, 2024 · eaac04d · eaac04d
1 parent 2b709f1
commit eaac04d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/flyteadmin/pkg/repositories/transformers/node_execution.go b/flyteadmin/pkg/repositories/transformers/node_execution.go
@@ -284,7 +284,7 @@ func UpdateNodeExecutionModel(
 
 	// In the case of dynamic nodes reporting DYNAMIC_RUNNING, the IsParent and IsDynamic bits will be set for this event.
 	// Update the node execution metadata accordingly.
-	if request.Event.IsParent || request.Event.IsDynamic {
+	if request.Event.IsParent || request.Event.IsDynamic || request.Event.IsArray {
 		var nodeExecutionMetadata admin.NodeExecutionMetaData
 		if len(nodeExecutionModel.NodeExecutionMetadata) > 0 {
 			if err := proto.Unmarshal(nodeExecutionModel.NodeExecutionMetadata, &nodeExecutionMetadata); err != nil {

diff --git a/flytepropeller/pkg/controller/nodes/transformers.go b/flytepropeller/pkg/controller/nodes/transformers.go
@@ -178,8 +178,10 @@ func ToNodeExecutionEvent(nodeExecID *core.NodeExecutionIdentifier,
 	if node.GetKind() == v1alpha1.NodeKindWorkflow && node.GetWorkflowNode() != nil && node.GetWorkflowNode().GetSubWorkflowRef() != nil {
 		nev.IsParent = true
 	} else if node.GetKind() == v1alpha1.NodeKindArray {
-		nev.IsParent = true
 		nev.IsArray = true
+		if config.GetConfig().ArrayNodeEventVersion == 1 {
+			nev.IsParent = true
+		}
 	} else if dynamicNodePhase != v1alpha1.DynamicNodePhaseNone {
 		nev.IsDynamic = true
 		if nev.GetTaskNodeMetadata() != nil && nev.GetTaskNodeMetadata().DynamicWorkflow != nil {