Skip to content

Commit

Permalink
fill in JobRunIdsToCancelStr on executor api (#3953)
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Martin <chris@cmartinit.co.uk>
  • Loading branch information
d80tb7 authored Sep 19, 2024
1 parent f9a6a6d commit bfc4975
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions internal/scheduler/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ func (srv *ExecutorApi) LeaseJobRuns(stream executorapi.ExecutorApi_LeaseJobRuns
JobRunIdsToCancel: slices.Map(runsToCancel, func(x string) *armadaevents.Uuid {
return armadaevents.MustProtoUuidFromUuidString(x)
}),
JobRunIdsToCancelStr: runsToCancel,
},
},
}); err != nil {
Expand Down
3 changes: 2 additions & 1 deletion internal/scheduler/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ func TestExecutorApi_LeaseJobRuns(t *testing.T) {
expectedMsgs: []*executorapi.LeaseStreamMessage{
{
Event: &executorapi.LeaseStreamMessage_CancelRuns{CancelRuns: &executorapi.CancelRuns{
JobRunIdsToCancel: []*armadaevents.Uuid{armadaevents.MustProtoUuidFromUuidString(runId2)},
JobRunIdsToCancel: []*armadaevents.Uuid{armadaevents.MustProtoUuidFromUuidString(runId2)},
JobRunIdsToCancelStr: []string{runId2},
}},
},
{
Expand Down

0 comments on commit bfc4975

Please sign in to comment.