forked from kubewharf/katalyst-core
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: headroom policy for dedicated numa (kubewharf#172)
Service performance score is considerd in new policy. Signed-off-by: linzhecheng <linzhecheng@bytedance.com>
- Loading branch information
1 parent
c8265f4
commit 5dfb126
Showing
12 changed files
with
279 additions
and
39 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
124 changes: 124 additions & 0 deletions
124
...nt/sysadvisor/plugin/qosaware/resource/cpu/region/headroompolicy/policy_numa_exclusive.go
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,124 @@ | ||
| /* | ||
| Copyright 2022 The Katalyst 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 headroompolicy | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "math" | ||
|
|
||
| "k8s.io/klog/v2" | ||
|
|
||
| "github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/metacache" | ||
| "github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/plugin/qosaware/resource/helper" | ||
| "github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/types" | ||
| "github.com/kubewharf/katalyst-core/pkg/config" | ||
| "github.com/kubewharf/katalyst-core/pkg/metaserver" | ||
| "github.com/kubewharf/katalyst-core/pkg/metaserver/spd" | ||
| "github.com/kubewharf/katalyst-core/pkg/metrics" | ||
| "github.com/kubewharf/katalyst-core/pkg/util/machine" | ||
| ) | ||
|
|
||
| type PolicyNUMAExclusive struct { | ||
| *PolicyBase | ||
| headroom float64 | ||
| } | ||
|
|
||
| // NOTE: NewPolicyNUMAExclusive can only for dedicated_cores with numa exclusive region | ||
|
|
||
| func NewPolicyNUMAExclusive(regionName string, regionType types.QoSRegionType, ownerPoolName string, | ||
| _ *config.Configuration, _ interface{}, metaReader metacache.MetaReader, | ||
| metaServer *metaserver.MetaServer, emitter metrics.MetricEmitter) HeadroomPolicy { | ||
| p := &PolicyNUMAExclusive{ | ||
| PolicyBase: NewPolicyBase(regionName, regionType, ownerPoolName, metaReader, metaServer, emitter), | ||
| } | ||
| return p | ||
| } | ||
|
|
||
| func (p *PolicyNUMAExclusive) getContainerInfos() (string, []*types.ContainerInfo, error) { | ||
| if len(p.podSet) != 1 { | ||
| return "", nil, fmt.Errorf("more than one pod are assgined to this policy") | ||
| } | ||
| cis := make([]*types.ContainerInfo, 0) | ||
| for podUID, containers := range p.podSet { | ||
| for _, container := range containers.List() { | ||
| ci, ok := p.metaReader.GetContainerInfo(podUID, container) | ||
| if !ok { | ||
| return "", nil, fmt.Errorf("failed to find continaer(%s/%s)", podUID, container) | ||
| } | ||
| cis = append(cis, ci) | ||
| } | ||
| return podUID, cis, nil | ||
| } | ||
| return "", nil, fmt.Errorf("should never get here") | ||
| } | ||
|
|
||
| func (p *PolicyNUMAExclusive) Update() error { | ||
| cpuEstimation := 0.0 | ||
| containerCnt := 0 | ||
|
|
||
| podUID, containers, err := p.getContainerInfos() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| enableReclaim, err := helper.PodEnableReclaim(context.Background(), p.metaServer, podUID, p.EnableReclaim) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if !enableReclaim { | ||
| p.headroom = 0 | ||
| return nil | ||
| } | ||
|
|
||
| for _, ci := range containers { | ||
| containerEstimation, err := helper.EstimateContainerCPUUsage(ci, p.metaReader, enableReclaim) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // FIXME: metric server doesn't support to report cpu usage in numa granularity, | ||
| // so we split cpu usage evenly across the binding numas of container. | ||
| if p.bindingNumas.Size() > 0 { | ||
| cpuSize := 0 | ||
| for _, numaID := range p.bindingNumas.ToSliceInt() { | ||
| cpuSize += ci.TopologyAwareAssignments[numaID].Size() | ||
| } | ||
| containerEstimation = containerEstimation * float64(cpuSize) / float64(machine.CountCPUAssignmentCPUs(ci.TopologyAwareAssignments)) | ||
| } | ||
|
|
||
| cpuEstimation += containerEstimation | ||
| containerCnt += 1 | ||
| } | ||
| cpuEstimation += p.ReservedForAllocate | ||
|
|
||
| originHeadroom := math.Max(p.ResourceUpperBound-cpuEstimation+p.ReservedForReclaim, 0) | ||
| score, err := helper.PodPerformanceScore(context.Background(), p.metaServer, podUID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| p.headroom = originHeadroom * (score - spd.MinPerformanceScore) / (spd.MaxPerformanceScore - spd.MinPerformanceScore) | ||
|
|
||
| klog.Infof("region %v cpuEstimation %v with reservedForAllocate %v reservedForReclaim %v"+ | ||
| " originHeadroom %v headroom %v score %v #container %v", p.regionName, cpuEstimation, p.ReservedForAllocate, | ||
| p.ReservedForReclaim, originHeadroom, p.headroom, score, containerCnt) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (p *PolicyNUMAExclusive) GetHeadroom() (float64, error) { | ||
| return p.headroom, nil | ||
| } |
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
Oops, something went wrong.