Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop admin launcher copying shard key from parent workflow #5174

Merged
merged 4 commits into from
Apr 4, 2024
+20 −2
Merged

Stop admin launcher copying shard key from parent workflow #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c68fd0
Remove shard key in admin-launcher
Tom-Newton Mar 27, 2024
0e1f2de
Don't mutate existing state
Tom-Newton Mar 27, 2024
73f15b0
Don't mutate state
Tom-Newton Mar 27, 2024
5d44e42
Add a test
Tom-Newton Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
evtErr "github.com/flyteorg/flyte/flytepropeller/events/errors"
"github.com/flyteorg/flyte/flytepropeller/pkg/compiler/transformers/k8s"
"github.com/flyteorg/flyte/flytestdlib/cache"
stdErr "github.com/flyteorg/flyte/flytestdlib/errors"
"github.com/flyteorg/flyte/flytestdlib/logger"
Expand Down Expand Up @@ -114,6 +115,15 @@ func (a *adminLaunchPlanExecutor) Launch(ctx context.Context, launchCtx LaunchCo
})
}

// Make a copy of the labels with shard-key removed. This ensures that the shard-key is re-computed for each
// instead of being copied from the parent.
labels := make(map[string]string)
for key, value := range launchCtx.Labels {
if key != k8s.ShardKeyLabel {
labels[key] = value
}
}

req := &admin.ExecutionCreateRequest{
Project: executionID.Project,
Domain: executionID.Domain,
Expand All @@ -127,7 +137,7 @@ func (a *adminLaunchPlanExecutor) Launch(ctx context.Context, launchCtx LaunchCo
Principal: launchCtx.Principal,
ParentNodeExecution: launchCtx.ParentNodeExecution,
},
Labels: &admin.Labels{Values: launchCtx.Labels},
Labels: &admin.Labels{Values: labels},
Annotations: &admin.Annotations{Values: launchCtx.Annotations},
SecurityContext: &launchCtx.SecurityContext,
MaxParallelism: int32(launchCtx.MaxParallelism),
Expand Down
10 changes: 9 additions & 1 deletion flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package launchplan

import (
"context"
"reflect"
"testing"
"time"

Expand Down Expand Up @@ -162,10 +163,14 @@ func TestAdminLaunchPlanExecutor_Launch(t *testing.T) {
ctx,
mock.MatchedBy(func(o *admin.ExecutionCreateRequest) bool {
return o.Project == "p" && o.Domain == "d" && o.Name == "n" && o.Spec.Inputs == nil &&
o.Spec.Metadata.Mode == admin.ExecutionMetadata_CHILD_WORKFLOW
o.Spec.Metadata.Mode == admin.ExecutionMetadata_CHILD_WORKFLOW &&
reflect.DeepEqual(o.Spec.Labels.Values, map[string]string{"foo": "bar"}) // Ensure shard-key was removed.
}),
).Return(nil, nil)
assert.NoError(t, err)

var labels = map[string]string{"foo": "bar", "shard-key": "1"}

err = exec.Launch(ctx,
LaunchContext{
ParentNodeExecution: &core.NodeExecutionIdentifier{
Expand All @@ -176,12 +181,15 @@ func TestAdminLaunchPlanExecutor_Launch(t *testing.T) {
Name: "w",
},
},
Labels: labels,
},
id,
&core.Identifier{},
nil,
)
assert.NoError(t, err)
// Ensure we haven't mutated the state of the parent workflow.
assert.True(t, reflect.DeepEqual(labels, map[string]string{"foo": "bar", "shard-key": "1"}))
})

t.Run("happy recover", func(t *testing.T) {
Expand Down
Loading