-
Notifications
You must be signed in to change notification settings - Fork 395
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
priority & fairness: support dynamically configuring work estimator m…
…ax seats Max seats from prioriy & fairness work estimator is now min(0.15 x nominalCL, nominalCL/handSize) 'Max seats' calculated by work estimator is currently hard coded to 10. When using lower values for --max-requests-inflight, a single LIST request taking up 10 seats could end up using all if not most seats in the priority level. This change updates the default work estimator config such that 'max seats' is at most 10% of the maximum concurrency limit for a priority level, with an upper limit of 10. This ensures seats taken from LIST request is proportional to the total available seats. Signed-off-by: Andrew Sy Kim <andrewsy@google.com> Kubernetes-commit: 4c5ea17576f30d8c2920d12cd77e866a980ccefa
- Loading branch information
1 parent
7c9db42
commit 9a86b3e
Showing
11 changed files
with
372 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| Copyright 2023 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package flowcontrol | ||
|
|
||
| import ( | ||
| "sync" | ||
| ) | ||
|
|
||
| // MaxSeatsTracker is used to track max seats allocatable per priority level from the work estimator | ||
| type MaxSeatsTracker interface { | ||
| // GetMaxSeats returns the maximum seats a request should occupy for a given priority level. | ||
| GetMaxSeats(priorityLevelName string) uint64 | ||
|
|
||
| // SetMaxSeats configures max seats for a priority level. | ||
| SetMaxSeats(priorityLevelName string, maxSeats uint64) | ||
|
|
||
| // ForgetPriorityLevel removes max seats tracking for a priority level. | ||
| ForgetPriorityLevel(priorityLevelName string) | ||
| } | ||
|
|
||
| type maxSeatsTracker struct { | ||
| sync.RWMutex | ||
|
|
||
| maxSeats map[string]uint64 | ||
| } | ||
|
|
||
| func NewMaxSeatsTracker() MaxSeatsTracker { | ||
| return &maxSeatsTracker{ | ||
| maxSeats: make(map[string]uint64), | ||
| } | ||
| } | ||
|
|
||
| func (m *maxSeatsTracker) GetMaxSeats(plName string) uint64 { | ||
| m.RLock() | ||
| defer m.RUnlock() | ||
|
|
||
| return m.maxSeats[plName] | ||
| } | ||
|
|
||
| func (m *maxSeatsTracker) SetMaxSeats(plName string, maxSeats uint64) { | ||
| m.Lock() | ||
| defer m.Unlock() | ||
|
|
||
| m.maxSeats[plName] = maxSeats | ||
| } | ||
|
|
||
| func (m *maxSeatsTracker) ForgetPriorityLevel(plName string) { | ||
| m.Lock() | ||
| defer m.Unlock() | ||
|
|
||
| delete(m.maxSeats, plName) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| /* | ||
| Copyright 2023 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package flowcontrol | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "k8s.io/api/flowcontrol/v1beta2" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| fqs "k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset" | ||
| "k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/eventclock" | ||
| "k8s.io/apiserver/pkg/util/flowcontrol/metrics" | ||
| "k8s.io/client-go/informers" | ||
| clientsetfake "k8s.io/client-go/kubernetes/fake" | ||
| ) | ||
|
|
||
| // Test_GetMaxSeats tests max seats retrieved from MaxSeatsTracker | ||
| func Test_GetMaxSeats(t *testing.T) { | ||
| testcases := []struct { | ||
| name string | ||
| nominalCL int | ||
| handSize int32 | ||
| expectedMaxSeats uint64 | ||
| }{ | ||
| { | ||
| name: "nominalCL=5, handSize=6", | ||
| nominalCL: 5, | ||
| handSize: 6, | ||
| expectedMaxSeats: 1, | ||
| }, | ||
| { | ||
| name: "nominalCL=10, handSize=6", | ||
| nominalCL: 10, | ||
| handSize: 6, | ||
| expectedMaxSeats: 1, | ||
| }, | ||
| { | ||
| name: "nominalCL=15, handSize=6", | ||
| nominalCL: 15, | ||
| handSize: 6, | ||
| expectedMaxSeats: 2, | ||
| }, | ||
| { | ||
| name: "nominalCL=20, handSize=6", | ||
| nominalCL: 20, | ||
| handSize: 6, | ||
| expectedMaxSeats: 3, | ||
| }, | ||
| { | ||
| name: "nominalCL=35, handSize=6", | ||
| nominalCL: 35, | ||
| handSize: 6, | ||
| expectedMaxSeats: 5, | ||
| }, | ||
| { | ||
| name: "nominalCL=100, handSize=6", | ||
| nominalCL: 100, | ||
| handSize: 6, | ||
| expectedMaxSeats: 15, | ||
| }, | ||
| { | ||
| name: "nominalCL=200, handSize=6", | ||
| nominalCL: 200, | ||
| handSize: 6, | ||
| expectedMaxSeats: 30, | ||
| }, | ||
| { | ||
| name: "nominalCL=10, handSize=1", | ||
| nominalCL: 10, | ||
| handSize: 1, | ||
| expectedMaxSeats: 2, | ||
| }, | ||
| { | ||
| name: "nominalCL=100, handSize=20", | ||
| nominalCL: 100, | ||
| handSize: 20, | ||
| expectedMaxSeats: 5, | ||
| }, | ||
| } | ||
|
|
||
| for _, testcase := range testcases { | ||
| t.Run(testcase.name, func(t *testing.T) { | ||
| clientset := clientsetfake.NewSimpleClientset() | ||
| informerFactory := informers.NewSharedInformerFactory(clientset, time.Second) | ||
| flowcontrolClient := clientset.FlowcontrolV1beta2() | ||
| startTime := time.Now() | ||
| clk, _ := eventclock.NewFake(startTime, 0, nil) | ||
| c := newTestableController(TestableConfig{ | ||
| Name: "Controller", | ||
| Clock: clk, | ||
| InformerFactory: informerFactory, | ||
| FlowcontrolClient: flowcontrolClient, | ||
| // for the purposes of this test, serverCL ~= nominalCL since there is | ||
| // only 1 PL with large concurrency shares, making mandatory PLs negligible. | ||
| ServerConcurrencyLimit: testcase.nominalCL, | ||
| RequestWaitLimit: time.Minute, | ||
| ReqsGaugeVec: metrics.PriorityLevelConcurrencyGaugeVec, | ||
| ExecSeatsGaugeVec: metrics.PriorityLevelExecutionSeatsGaugeVec, | ||
| QueueSetFactory: fqs.NewQueueSetFactory(clk), | ||
| }) | ||
|
|
||
| testPriorityLevel := &v1beta2.PriorityLevelConfiguration{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "test-pl", | ||
| }, | ||
| Spec: v1beta2.PriorityLevelConfigurationSpec{ | ||
| Type: v1beta2.PriorityLevelEnablementLimited, | ||
| Limited: &v1beta2.LimitedPriorityLevelConfiguration{ | ||
| AssuredConcurrencyShares: 10000, | ||
| LimitResponse: v1beta2.LimitResponse{ | ||
| Queuing: &v1beta2.QueuingConfiguration{ | ||
| HandSize: testcase.handSize, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| c.digestConfigObjects([]*v1beta2.PriorityLevelConfiguration{testPriorityLevel}, nil) | ||
| maxSeats := c.GetMaxSeats("test-pl") | ||
| if maxSeats != testcase.expectedMaxSeats { | ||
| t.Errorf("unexpected max seats, got=%d, want=%d", maxSeats, testcase.expectedMaxSeats) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.