Skip to content

Commit 235719a

Browse files
xu282934741xu282934741
authored
Merge pull request #866 from luomingmeng/dev/numa-allocation-and-numa-eviction-remove-sg
numa allocation and numa eviction remove sg
2 parents 27280f3 + 482c8f0 commit 235719a

File tree

12 files changed

+184
-72
lines changed

12 files changed

+184
-72
lines changed

‎cmd/katalyst-agent/app/options/dynamic/adminqos/eviction/cpu_pressure_eviction.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ type CPUPressureEvictionOptions struct {
4949
MaxSuppressionToleranceRate float64
5050
MinSuppressionToleranceDuration time.Duration
5151
GracePeriod int64
52+
NumaCPUPressureEvictionOptions NumaCPUPressureEvictionOptions
5253
}
5354

5455
// NewCPUPressureEvictionOptions returns a new CPUPressureEvictionOptions
@@ -64,6 +65,7 @@ func NewCPUPressureEvictionOptions() *CPUPressureEvictionOptions {
6465
MaxSuppressionToleranceRate: defaultMaxSuppressionToleranceRate,
6566
MinSuppressionToleranceDuration: defaultMinSuppressionToleranceDuration,
6667
GracePeriod: defaultGracePeriod,
68+
NumaCPUPressureEvictionOptions: NewNumaCPUPressureEvictionOptions(),
6769
}
6870
}
6971

@@ -96,6 +98,7 @@ func (o *CPUPressureEvictionOptions) AddFlags(fss *cliflag.NamedFlagSets) {
9698
fs.Int64Var(&o.GracePeriod, "eviction-cpu-grace-period", o.GracePeriod,
9799
"the ratio between the times metric value over the bound value and the metric ring size is greater than this percentage "+
98100
", the eviction or node taint will be triggered")
101+
o.NumaCPUPressureEvictionOptions.AddFlags(fss)
99102
}
100103

101104
func (o *CPUPressureEvictionOptions) ApplyTo(c *eviction.CPUPressureEvictionConfiguration) error {
@@ -109,5 +112,10 @@ func (o *CPUPressureEvictionOptions) ApplyTo(c *eviction.CPUPressureEvictionConf
109112
c.MaxSuppressionToleranceRate = o.MaxSuppressionToleranceRate
110113
c.MinSuppressionToleranceDuration = o.MinSuppressionToleranceDuration
111114
c.GracePeriod = o.GracePeriod
115+
116+
if err := o.NumaCPUPressureEvictionOptions.ApplyTo(&c.NumaCPUPressureEvictionConfiguration); err != nil {
117+
return err
118+
}
119+
112120
return nil
113121
}

‎cmd/katalyst-agent/app/options/dynamic/adminqos/eviction/numa_cpu_pressure_eviction.go

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
Copyright 2022 The Katalyst Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package eviction
18+
19+
import (
20+
cliflag "k8s.io/component-base/cli/flag"
21+
22+
"github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic/adminqos/eviction"
23+
)
24+
25+
type NumaCPUPressureEvictionOptions struct {
26+
EnableEviction bool
27+
ThresholdMetPercentage float64
28+
MetricRingSize int
29+
GracePeriod int64
30+
ThresholdExpandFactor float64
31+
}
32+
33+
func NewNumaCPUPressureEvictionOptions() NumaCPUPressureEvictionOptions {
34+
return NumaCPUPressureEvictionOptions{
35+
EnableEviction: false,
36+
ThresholdMetPercentage: 0.7,
37+
MetricRingSize: 4,
38+
GracePeriod: 60,
39+
ThresholdExpandFactor: 1.1,
40+
}
41+
}
42+
43+
func (o *NumaCPUPressureEvictionOptions) AddFlags(fss *cliflag.NamedFlagSets) {
44+
fs := fss.FlagSet("numa-cpu-pressure-eviction")
45+
46+
fs.BoolVar(&o.EnableEviction, "numa-cpu-pressure-eviction-enable", o.EnableEviction,
47+
"Enable numa cpu pressure eviction")
48+
fs.Float64Var(&o.ThresholdMetPercentage, "numa-cpu-pressure-eviction-threshold-met-percentage", o.ThresholdMetPercentage,
49+
"The percentage of NUMA nodes whose CPU pressure meets the threshold to trigger eviction")
50+
fs.IntVar(&o.MetricRingSize, "numa-cpu-pressure-eviction-metric-ring-size", o.MetricRingSize,
51+
"The size of the metric ring for NUMA CPU pressure")
52+
fs.Int64Var(&o.GracePeriod, "numa-cpu-pressure-eviction-grace-period", o.GracePeriod,
53+
"The grace period (in seconds) before evicting pods due to NUMA CPU pressure")
54+
fs.Float64Var(&o.ThresholdExpandFactor, "numa-cpu-pressure-eviction-threshold-expand-factor", o.ThresholdExpandFactor,
55+
"The factor by which to expand the NUMA CPU pressure threshold")
56+
}
57+
58+
func (o *NumaCPUPressureEvictionOptions) ApplyTo(c *eviction.NumaCPUPressureEvictionConfiguration) error {
59+
c.EnableEviction = o.EnableEviction
60+
c.ThresholdMetPercentage = o.ThresholdMetPercentage
61+
c.MetricRingSize = o.MetricRingSize
62+
c.GracePeriod = o.GracePeriod
63+
c.ThresholdExpandFactor = o.ThresholdExpandFactor
64+
return nil
65+
}

‎cmd/katalyst-agent/app/options/qrm/cpu_plugin.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ type CPUDynamicPolicyOptions struct {
4646
CPUNUMAHintPreferPolicy string
4747
CPUNUMAHintPreferLowThreshold float64
4848
SharedCoresNUMABindingResultAnnotationKey string
49+
EnableMetricPreferredNumaAllocation bool
4950
}
5051

5152
type CPUNativePolicyOptions struct {
@@ -72,6 +73,7 @@ func NewCPUOptions() *CPUOptions {
7273
commonstate.PoolNameReserve,
7374
},
7475
SharedCoresNUMABindingResultAnnotationKey: consts.PodAnnotationNUMABindResultKey,
76+
EnableMetricPreferredNumaAllocation: false,
7577
},
7678
CPUNativePolicyOptions: CPUNativePolicyOptions{
7779
EnableFullPhysicalCPUsOnly: false,
@@ -106,6 +108,8 @@ func (o *CPUOptions) AddFlags(fss *cliflag.NamedFlagSets) {
106108
"it decides hint preference calculation strategy")
107109
fs.Float64Var(&o.CPUNUMAHintPreferLowThreshold, "cpu-numa-hint-prefer-low-threshold", o.CPUNUMAHintPreferLowThreshold,
108110
"it indicates threshold to apply CPUNUMAHintPreferPolicy dynamically, and it's working when CPUNUMAHintPreferPolicy is set to dynamic_packing")
111+
fs.BoolVar(&o.EnableMetricPreferredNumaAllocation, "enable-metric-preferred-numa-allocation", o.EnableMetricPreferredNumaAllocation,
112+
"if set true, we will enable metric preferred numa")
109113
fs.StringVar(&o.CPUAllocationOption, "cpu-allocation-option",
110114
o.CPUAllocationOption, "The allocation option of cpu (packed/distributed). The default value is packed."+
111115
"in cases where more than one NUMA node is required to satisfy the allocation.")
@@ -131,6 +135,7 @@ func (o *CPUOptions) ApplyTo(conf *qrmconfig.CPUQRMPluginConfig) error {
131135
conf.CPUAllocationOption = o.CPUAllocationOption
132136
conf.CPUNUMAHintPreferPolicy = o.CPUNUMAHintPreferPolicy
133137
conf.CPUNUMAHintPreferLowThreshold = o.CPUNUMAHintPreferLowThreshold
138+
conf.EnableMetricPreferredNumaAllocation = o.EnableMetricPreferredNumaAllocation
134139
conf.SharedCoresNUMABindingResultAnnotationKey = o.SharedCoresNUMABindingResultAnnotationKey
135140
return nil
136141
}

‎pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/strategy/pressure_numa.go

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/commonstate"
3232
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/dynamicpolicy/state"
3333
"github.com/kubewharf/katalyst-core/pkg/config"
34+
"github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic"
3435
"github.com/kubewharf/katalyst-core/pkg/consts"
3536
"github.com/kubewharf/katalyst-core/pkg/metaserver"
3637
"github.com/kubewharf/katalyst-core/pkg/metrics"
@@ -89,12 +90,7 @@ type NumaCPUPressureEviction struct {
8990
func NewCPUPressureUsageEviction(emitter metrics.MetricEmitter, metaServer *metaserver.MetaServer,
9091
conf *config.Configuration, state state.ReadonlyState,
9192
) (CPUPressureEviction, error) {
92-
numaPressureConfig := &NumaPressureConfig{
93-
MetricRingSize: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCpuPressureMetricRingSize,
94-
ThresholdMetPercentage: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCpuPressureThresholdMetPercentage,
95-
GracePeriod: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCpuPressureGracePeriod,
96-
ExpandFactor: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCpuThresholdExpandFactor,
97-
}
93+
numaPressureConfig := getNumaPressureConfig(conf.GetDynamicConfiguration())
9894

9995
return &NumaCPUPressureEviction{
10096
state: state,
@@ -443,9 +439,17 @@ func (p *NumaCPUPressureEviction) pickTopOverRatioPod(numaID int, metricName str
443439
}
444440

445441
type NumaPressureConfig struct {
446-
MetricRingSize int
447-
ThresholdMetPercentage float64
448-
NumaThresholdPercentage float64
449-
GracePeriod int64
450-
ExpandFactor float64
442+
MetricRingSize int
443+
ThresholdMetPercentage float64
444+
GracePeriod int64
445+
ExpandFactor float64
446+
}
447+
448+
func getNumaPressureConfig(conf *dynamic.Configuration) *NumaPressureConfig {
449+
return &NumaPressureConfig{
450+
MetricRingSize: conf.NumaCPUPressureEvictionConfiguration.MetricRingSize,
451+
ThresholdMetPercentage: conf.NumaCPUPressureEvictionConfiguration.ThresholdMetPercentage,
452+
GracePeriod: conf.NumaCPUPressureEvictionConfiguration.GracePeriod,
453+
ExpandFactor: conf.NumaCPUPressureEvictionConfiguration.ThresholdExpandFactor,
454+
}
451455
}

‎pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/strategy/pressure_numa_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func TestNumaCPUPressureEviction_update(t *testing.T) {
181181
conf: conf,
182182
numaPressureConfig: &NumaPressureConfig{
183183
MetricRingSize: 1,
184-
ThresholdMetPercentage: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCpuPressureThresholdMetPercentage,
184+
ThresholdMetPercentage: conf.DynamicAgentConfiguration.GetDynamicConfiguration().ThresholdMetPercentage,
185185
GracePeriod: conf.DynamicAgentConfiguration.GetDynamicConfiguration().DeletionGracePeriod,
186186
ExpandFactor: 1.2,
187187
},
@@ -221,7 +221,7 @@ func TestNumaCPUPressureEviction_update(t *testing.T) {
221221
conf: conf,
222222
numaPressureConfig: &NumaPressureConfig{
223223
MetricRingSize: 1,
224-
ThresholdMetPercentage: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCpuPressureThresholdMetPercentage,
224+
ThresholdMetPercentage: conf.DynamicAgentConfiguration.GetDynamicConfiguration().NumaCPUPressureEvictionConfiguration.ThresholdMetPercentage,
225225
GracePeriod: conf.DynamicAgentConfiguration.GetDynamicConfiguration().DeletionGracePeriod,
226226
ExpandFactor: 1.2,
227227
},

‎pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/strategy/pressure_threshold.go

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,35 @@ import (
2121
"fmt"
2222

2323
"github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic/metricthreshold"
24-
"github.com/kubewharf/katalyst-core/pkg/consts"
2524
"github.com/kubewharf/katalyst-core/pkg/metaserver/agent/metric/helper"
2625
"github.com/kubewharf/katalyst-core/pkg/util/general"
27-
"github.com/kubewharf/katalyst-core/pkg/util/strategygroup"
2826
)
2927

3028
var ThresholdMin = 0.4
3129

3230
func (p *NumaCPUPressureEviction) pullThresholds(_ context.Context) {
33-
enabled, err := strategygroup.IsStrategyEnabledForNode(consts.StrategyNameNumaCpuPressureEviction, false, p.conf)
34-
if err != nil {
35-
general.Errorf("failed to get eviction strategy: %v", err)
36-
return
37-
}
31+
dynamicConf := p.conf.DynamicAgentConfiguration.GetDynamicConfiguration()
32+
// todo support strategygroup in the future
33+
//enabled, err := strategygroup.IsStrategyEnabledForNode(consts.StrategyNameNumaCpuPressureEviction,
34+
// dynamicConf.NumaCPUPressureEvictionConfiguration.EnableEviction, p.conf)
35+
//if err != nil {
36+
// general.Errorf("failed to get eviction strategy: %v", err)
37+
// return
38+
//}
39+
enabled := dynamicConf.NumaCPUPressureEvictionConfiguration.EnableEviction
3840
if !enabled {
3941
general.Warningf("eviction strategy is disabled, skip pullThresholds")
4042
return
4143
}
4244

45+
numaPressureConfig := getNumaPressureConfig(dynamicConf)
4346
cpuCodeName := helper.GetCpuCodeName(p.metaServer.MetricsFetcher)
4447
isVM, _ := helper.GetIsVm(p.metaServer.MetricsFetcher)
4548

46-
globalThresholds := p.conf.DynamicAgentConfiguration.GetDynamicConfiguration().MetricThreshold
47-
thresholds := getOverLoadThreshold(globalThresholds, cpuCodeName, isVM)
49+
thresholds := getOverLoadThreshold(dynamicConf.MetricThreshold, cpuCodeName, isVM)
4850
thresholds = convertThreshold(thresholds)
49-
expandedThresholds := expandThresholds(thresholds, p.numaPressureConfig.ExpandFactor)
50-
err = validateThresholds(thresholds)
51+
expandedThresholds := expandThresholds(thresholds, numaPressureConfig.ExpandFactor)
52+
err := validateThresholds(thresholds)
5153
if err != nil {
5254
general.Warningf("%v", err.Error())
5355
return
@@ -60,6 +62,13 @@ func (p *NumaCPUPressureEviction) pullThresholds(_ context.Context) {
6062
p.enabled = enabled
6163
general.Infof("update thresholds to %v", expandedThresholds)
6264
p.thresholds = expandedThresholds
65+
general.Infof("update numaPressureConfig to %v", numaPressureConfig)
66+
p.numaPressureConfig = numaPressureConfig
67+
68+
if p.metricsHistory.RingSize != numaPressureConfig.MetricRingSize {
69+
general.Infof("update metricsHistory ring size to %v", numaPressureConfig.MetricRingSize)
70+
p.metricsHistory = NewMetricHistory(numaPressureConfig.MetricRingSize)
71+
}
6372
}
6473

6574
func expandThresholds(thresholds map[string]float64, expandFactor float64) map[string]float64 {

‎pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy.go

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ type DynamicPolicy struct {
129129
transitionPeriod time.Duration
130130
cpuNUMAHintPreferPolicy string
131131
cpuNUMAHintPreferLowThreshold float64
132+
enableMetricPreferredNumaAllocation bool
132133

133134
reservedReclaimedCPUsSize int
134135
reservedReclaimedCPUSet machine.CPUSet
@@ -193,22 +194,23 @@ func NewDynamicPolicy(agentCtx *agent.GenericContext, conf *config.Configuration
193194

194195
cpuPressureEviction: cpuPressureEviction,
195196

196-
conf: conf,
197-
qosConfig: conf.QoSConfiguration,
198-
dynamicConfig: conf.DynamicAgentConfiguration,
199-
cpuAdvisorSocketAbsPath: conf.CPUAdvisorSocketAbsPath,
200-
cpuPluginSocketAbsPath: conf.CPUPluginSocketAbsPath,
201-
enableReclaimNUMABinding: conf.EnableReclaimNUMABinding,
202-
enableSNBHighNumaPreference: conf.EnableSNBHighNumaPreference,
203-
enableCPUAdvisor: conf.CPUQRMPluginConfig.EnableCPUAdvisor,
204-
getAdviceInterval: conf.CPUQRMPluginConfig.GetAdviceInterval,
205-
cpuNUMAHintPreferPolicy: conf.CPUQRMPluginConfig.CPUNUMAHintPreferPolicy,
206-
cpuNUMAHintPreferLowThreshold: conf.CPUQRMPluginConfig.CPUNUMAHintPreferLowThreshold,
207-
reservedCPUs: reservedCPUs,
208-
extraStateFileAbsPath: conf.ExtraStateFileAbsPath,
209-
enableSyncingCPUIdle: conf.CPUQRMPluginConfig.EnableSyncingCPUIdle,
210-
enableCPUIdle: conf.CPUQRMPluginConfig.EnableCPUIdle,
211-
reclaimRelativeRootCgroupPath: conf.ReclaimRelativeRootCgroupPath,
197+
conf: conf,
198+
qosConfig: conf.QoSConfiguration,
199+
dynamicConfig: conf.DynamicAgentConfiguration,
200+
cpuAdvisorSocketAbsPath: conf.CPUAdvisorSocketAbsPath,
201+
cpuPluginSocketAbsPath: conf.CPUPluginSocketAbsPath,
202+
enableReclaimNUMABinding: conf.EnableReclaimNUMABinding,
203+
enableSNBHighNumaPreference: conf.EnableSNBHighNumaPreference,
204+
enableCPUAdvisor: conf.CPUQRMPluginConfig.EnableCPUAdvisor,
205+
getAdviceInterval: conf.CPUQRMPluginConfig.GetAdviceInterval,
206+
cpuNUMAHintPreferPolicy: conf.CPUQRMPluginConfig.CPUNUMAHintPreferPolicy,
207+
cpuNUMAHintPreferLowThreshold: conf.CPUQRMPluginConfig.CPUNUMAHintPreferLowThreshold,
208+
enableMetricPreferredNumaAllocation: conf.CPUQRMPluginConfig.EnableMetricPreferredNumaAllocation,
209+
reservedCPUs: reservedCPUs,
210+
extraStateFileAbsPath: conf.ExtraStateFileAbsPath,
211+
enableSyncingCPUIdle: conf.CPUQRMPluginConfig.EnableSyncingCPUIdle,
212+
enableCPUIdle: conf.CPUQRMPluginConfig.EnableCPUIdle,
213+
reclaimRelativeRootCgroupPath: conf.ReclaimRelativeRootCgroupPath,
212214
numaBindingReclaimRelativeRootCgroupPaths: common.GetNUMABindingReclaimRelativeRootCgroupPaths(conf.ReclaimRelativeRootCgroupPath,
213215
agentCtx.CPUDetails.NUMANodes().ToSliceNoSortInt()),
214216
podDebugAnnoKeys: conf.PodDebugAnnoKeys,

‎pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy_hint_handlers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ import (
3434
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/dynamicpolicy/state"
3535
cpuutil "github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/util"
3636
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/util"
37-
"github.com/kubewharf/katalyst-core/pkg/consts"
3837
"github.com/kubewharf/katalyst-core/pkg/metaserver"
3938
"github.com/kubewharf/katalyst-core/pkg/metaserver/spd"
4039
"github.com/kubewharf/katalyst-core/pkg/metrics"
4140
"github.com/kubewharf/katalyst-core/pkg/util/general"
4241
"github.com/kubewharf/katalyst-core/pkg/util/machine"
4342
qosutil "github.com/kubewharf/katalyst-core/pkg/util/qos"
44-
"github.com/kubewharf/katalyst-core/pkg/util/strategygroup"
4543
)
4644

4745
var errNoAvailableCPUHints = fmt.Errorf("no available cpu hints")
@@ -921,7 +919,9 @@ func (p *DynamicPolicy) calculateHintsForNUMABindingSharedCores(request float64,
921919
})
922920
}
923921

924-
metricPolicyEnabled, _ := strategygroup.IsStrategyEnabledForNode(consts.StrategyNameMetricPreferredNUMAAllocation, false, p.conf)
922+
metricPolicyEnabled := p.enableMetricPreferredNumaAllocation
923+
// todo support strategygroup in the future
924+
// metricPolicyEnabled, _ := strategygroup.IsStrategyEnabledForNode(consts.StrategyNameMetricPreferredNUMAAllocation, p.enableMetricPreferredNumaAllocation, p.conf)
925925

926926
general.Infof("metricPolicyEnabled: %v", metricPolicyEnabled)
927927

‎pkg/config/agent/dynamic/adminqos/eviction/cpu_pressure_eviction.go

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,23 @@ import (
2323
)
2424

2525
type CPUPressureEvictionConfiguration struct {
26-
EnableLoadEviction bool
27-
LoadUpperBoundRatio float64
28-
LoadLowerBoundRatio float64
29-
LoadThresholdMetPercentage float64
30-
LoadMetricRingSize int
31-
LoadEvictionCoolDownTime time.Duration
32-
EnableSuppressionEviction bool
33-
MaxSuppressionToleranceRate float64
34-
MinSuppressionToleranceDuration time.Duration
35-
GracePeriod int64
26+
EnableLoadEviction bool
27+
LoadUpperBoundRatio float64
28+
LoadLowerBoundRatio float64
29+
LoadThresholdMetPercentage float64
30+
LoadMetricRingSize int
31+
LoadEvictionCoolDownTime time.Duration
32+
EnableSuppressionEviction bool
33+
MaxSuppressionToleranceRate float64
34+
MinSuppressionToleranceDuration time.Duration
35+
GracePeriod int64
36+
NumaCPUPressureEvictionConfiguration NumaCPUPressureEvictionConfiguration
3637
}
3738

3839
func NewCPUPressureEvictionConfiguration() *CPUPressureEvictionConfiguration {
39-
return &CPUPressureEvictionConfiguration{}
40+
return &CPUPressureEvictionConfiguration{
41+
NumaCPUPressureEvictionConfiguration: NewNumaCPUPressureEvictionConfiguration(),
42+
}
4043
}
4144

4245
func (c *CPUPressureEvictionConfiguration) ApplyConfiguration(conf *crd.DynamicConfigCRD) {
@@ -83,4 +86,6 @@ func (c *CPUPressureEvictionConfiguration) ApplyConfiguration(conf *crd.DynamicC
8386
c.GracePeriod = *config.GracePeriod
8487
}
8588
}
89+
90+
c.NumaCPUPressureEvictionConfiguration.ApplyConfiguration(conf)
8691
}

‎pkg/config/agent/dynamic/adminqos/eviction/eviction_base.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ type EvictionConfiguration struct {
3131
*ReclaimedResourcesEvictionConfiguration
3232
*SystemLoadEvictionPluginConfiguration
3333
*NetworkEvictionConfiguration
34-
*NumaCPUPressureEvictionConfiguration
3534
}
3635

3736
func NewEvictionConfiguration() *EvictionConfiguration {
@@ -42,7 +41,6 @@ func NewEvictionConfiguration() *EvictionConfiguration {
4241
ReclaimedResourcesEvictionConfiguration: NewReclaimedResourcesEvictionConfiguration(),
4342
SystemLoadEvictionPluginConfiguration: NewSystemLoadEvictionPluginConfiguration(),
4443
NetworkEvictionConfiguration: NewNetworkEvictionConfiguration(),
45-
NumaCPUPressureEvictionConfiguration: NewNumaCPUPressureEvictionConfiguration(),
4644
}
4745
}
4846

@@ -58,5 +56,4 @@ func (c *EvictionConfiguration) ApplyConfiguration(conf *crd.DynamicConfigCRD) {
5856
c.ReclaimedResourcesEvictionConfiguration.ApplyConfiguration(conf)
5957
c.SystemLoadEvictionPluginConfiguration.ApplyConfiguration(conf)
6058
c.NetworkEvictionConfiguration.ApplyConfiguration(conf)
61-
c.NumaCPUPressureEvictionConfiguration.ApplyConfiguration(conf)
6259
}

0 commit comments

Comments
 (0)