Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
bgedik committed Oct 15, 2024
1 parent b6e40d0 commit 819f871
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion flytepropeller/pkg/controller/nodes/dynamic/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ func (d dynamicNodeTaskNodeHandler) handleDynamicSubNodes(ctx context.Context, n
// These outputPaths only reads the output metadata. So the sandbox is completely optional here and hence it is nil.
// The sandbox creation as it uses hashing can be expensive and we skip that expense.
outputPaths := ioutils.NewReadOnlyOutputFilePaths(ctx, nCtx.DataStore(), nCtx.NodeStatus().GetOutputDir())
outputReader := ioutils.NewRemoteFileOutputReader(ctx, nCtx.DataStore(), outputPaths, 0)
outputReader, err := ioutils.NewRemoteFileOutputReader(ctx, nCtx.DataStore(), outputPaths, 0)
if err != nil {
return handler.UnknownTransition, prevState, err

Check warning on line 146 in flytepropeller/pkg/controller/nodes/dynamic/handler.go

View check run for this annotation

Codecov / codecov/patch

flytepropeller/pkg/controller/nodes/dynamic/handler.go#L146

Added line #L146 was not covered by tests
}
ee, err := d.TaskNodeHandler.ValidateOutput(ctx, nCtx.NodeID(), nCtx.InputReader(),
outputReader, nil, nCtx.ExecutionContext().GetExecutionConfig(), nCtx.TaskReader())

Expand Down

0 comments on commit 819f871

Please sign in to comment.