-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhancement(eviction): load eviction support dynamic threshold (#129)
* enhancement(eviction): evict by share pool status * enhancement(eviction): load eviction plugin use readonly state * chore(eviction): make test parallel * chore(eviction): rename some function and add some metric * enhancement(eviction): extract GetPodPoolMapFunc interface * enhancement(eviction): ignore isolation pool * refine implementation for load pressure --------- Co-authored-by: shaowei.wayne <shaowei.wayne@bytedance.com>
- Loading branch information
1 parent
71cad3a
commit 83bce0c
Showing
17 changed files
with
1,180 additions
and
115 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
85 changes: 85 additions & 0 deletions
85
pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/strategy/pod_pool_getter.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,85 @@ | ||
| /* | ||
| 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 strategy | ||
|
|
||
| import ( | ||
| "github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/dynamicpolicy/state" | ||
| "github.com/kubewharf/katalyst-core/pkg/metaserver/agent/pod" | ||
| "github.com/kubewharf/katalyst-core/pkg/util/general" | ||
| ) | ||
|
|
||
| var getPodPoolMapFunc = DefaultGetPodPoolMapFunc | ||
|
|
||
| // PodPoolMap is a map keyed by pod UID, the value is a map keyed by container name | ||
| // and its value is the container info with owner pool. | ||
| type PodPoolMap map[string]map[string]*ContainerOwnerPoolInfo | ||
|
|
||
| func (p PodPoolMap) PutContainerOwnerPoolInfo(podUID string, containerName string, ownerPool string, poolSize int, isPool bool) { | ||
| containerOwnerPoolInfo := &ContainerOwnerPoolInfo{ | ||
| OwnerPool: ownerPool, | ||
| PoolSize: poolSize, | ||
| IsPool: isPool, | ||
| } | ||
|
|
||
| if podMap, ok := p[podUID]; ok { | ||
| podMap[containerName] = containerOwnerPoolInfo | ||
| } else { | ||
| pm := map[string]*ContainerOwnerPoolInfo{containerName: containerOwnerPoolInfo} | ||
| p[podUID] = pm | ||
| } | ||
| } | ||
|
|
||
| // GetPodPoolMapFunc returns a map keyed by pod UID, the value is a map keyed by container name | ||
| // and its value is the container info with owner pool. | ||
| type GetPodPoolMapFunc func(pod.PodFetcher, state.ReadonlyState) PodPoolMap | ||
|
|
||
| type ContainerOwnerPoolInfo struct { | ||
| OwnerPool string | ||
| PoolSize int | ||
| IsPool bool | ||
| } | ||
|
|
||
| // SetGetPodPoolMapFunc provides a hook to change the implementation of GetPodPoolMapFunc | ||
| func SetGetPodPoolMapFunc(f GetPodPoolMapFunc) { | ||
| general.Infof("SetGetPodPoolMapFunc called") | ||
| getPodPoolMapFunc = f | ||
| } | ||
|
|
||
| var DefaultGetPodPoolMapFunc GetPodPoolMapFunc = func(fetcher pod.PodFetcher, readonlyState state.ReadonlyState) PodPoolMap { | ||
| result := make(PodPoolMap) | ||
|
|
||
| for podUID, entry := range readonlyState.GetPodEntries() { | ||
| for containerName, containerEntry := range entry { | ||
| if entry.IsPoolEntry() { | ||
| result.PutContainerOwnerPoolInfo(podUID, containerName, podUID, containerEntry.AllocationResult.Size(), true) | ||
| continue | ||
| } | ||
|
|
||
| if containerEntry == nil { | ||
| continue | ||
| } else if containerEntry.OwnerPoolName == "" { | ||
| general.Infof("skip get pool name for pod: %s, "+ | ||
| "container: %s with owner pool name: %s", podUID, containerName, containerEntry.OwnerPoolName) | ||
| continue | ||
| } | ||
|
|
||
| result.PutContainerOwnerPoolInfo(podUID, containerName, containerEntry.OwnerPoolName, containerEntry.AllocationResult.Size(), false) | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| } |
Oops, something went wrong.