8000 fix: required affinity by grutt · Pull Request #812 · hatchet-dev/hatchet · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: required affinity #812

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

Merged
merged 3 commits into from
Aug 23, 2024
Merged

fix: required affinity #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b51bf0
fix: required affinity
grutt Aug 23, 2024
6298d48
chore: rm dead code
grutt Aug 23, 2024
37be843
chore: rm comment
grutt Aug 23, 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
7 changes: 7 additions & 0 deletions pkg/scheduling/affinity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ func TestComputeWeight(t *testing.T) {
{
name: "No match for a required returns -1",
desiredLabels: []*dbsqlc.GetDesiredLabelsRow{
{
Key: "memory",
Comparator: dbsqlc.WorkerLabelComparatorEQUAL,
StrValue: sqlchelpers.TextFromStr("100"),
Weight: 15,
Required: false,
},
{
Key: "region",
Comparator: dbsqlc.WorkerLabelComparatorEQUAL,
Expand Down
21 changes: 21 additions & 0 deletions pkg/scheduling/fixtures/affinity_hard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@
"tenantId": "707d0855-80ab-4e1f-a156-f1c4546cbf52",
"queue": "child:process2",
"Order": 0
},
{
"id": 152260,
"stepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdef",
"stepId": "e2c744b8-bebb-4b05-8292-d2ce36f27929",
"actionId": "child:process2",
"scheduleTimeoutAt": "2024-08-07T21:12:49.56Z",
"stepTimeout": "60s",
"isQueued": true,
"tenantId": "707d0855-80ab-4e1f-a156-f1c4546cbf52",
"queue": "child:process2",
"Order": 0
}
],
"WorkerLabels": {
Expand Down Expand Up @@ -86,6 +98,15 @@
"Required": true,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27929": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "C",
"Required": true,
"Weight": 1
}
]
}
}
45 changes: 45 additions & 0 deletions pkg/scheduling/fixtures/affinity_hard_output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"StepRunIds": [
"16fa711e-c03e-435c-88d9-62adf1591d98",
"064e787a-6cfd-4f82-8b6d-d8031459fdee"
],
"StepRunTimeouts": [
"60s",
"60s"
],
"SlotIds": [
"8cf68f09-b914-4f31-9777-8082b751a2d4",
"aed946be-43db-4b5f-876a-c6c71f4d52aa"
],
"WorkerIds": [
"aaaaaaaa-43db-4b5f-876a-c6c71f4d52aa",
"bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa"
],
"UnassignedStepRunIds": [
"064e787a-6cfd-4f82-8b6d-d8031459fdef"
],
"QueuedStepRuns": [
{
"StepRunId": "16fa711e-c03e-435c-88d9-62adf1591d98",
"WorkerId": "aaaaaaaa-43db-4b5f-876a-c6c71f4d52aa",
"DispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21"
},
{
"StepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdee",
"WorkerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"DispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21"
}
],
"TimedOutStepRuns": [],
"RateLimitedStepRuns": [],
"RateLimitedQueues": {},
"QueuedItems": [
137295,
152259
],
"ShouldContinue": false,
"MinQueuedIds": {
"child:process2": 0
},
"RateLimitUnitsConsumed": {}
}
0 pkg/scheduling/fixtures/affinity_output.json → ...duling/fixtures/affinity_soft_output.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/scheduling/scheduling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func TestGeneratePlan(t *testing.T) {
name: "GeneratePlan_Affinity_Soft",
args: args{
fixtureArgs: "./fixtures/affinity_soft.json",
fixtureResult: "./fixtures/affinity_output.json",
fixtureResult: "./fixtures/affinity_soft_output.json",
noTimeout: true,
},
want: func(s SchedulePlan, fixtureResult string) bool {
Expand All @@ -175,7 +175,7 @@ func TestGeneratePlan(t *testing.T) {
name: "GeneratePlan_Affinity_Hard",
args: args{
fixtureArgs: "./fixtures/affinity_hard.json",
fixtureResult: "./fixtures/affinity_output.json",
fixtureResult: "./fixtures/affinity_hard_output.json",
noTimeout: true,
},
want: func(s SchedulePlan, fixtureResult string) bool {
Expand Down
5 changes: 0 additions & 5 deletions pkg/scheduling/worker_state_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ func NewWorkerStateManager(
for workerId, worker := range workers {
weight := ComputeWeight(desired, worker.labels)

// skip workers that are not a match (i.e. required)
if weight < 0 {
continue
}

// cache the weight on the worker
workers[workerId].AddStepWeight(stepId, weight)

Expand Down
Loading
0