Merge pull request #1016 from JulyWindK/dev/kfx-sys-cpu-pressure-eviction

feat(eviction): support numa sys cpu pressure eviction

Author: xu282934741

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

@@ -39,33 +39,35 @@ const (
 
 // CPUPressureEvictionOptions is the options of cpu pressure eviction
 type CPUPressureEvictionOptions struct {
-	EnableLoadEviction              bool
-	LoadUpperBoundRatio             float64
-	LoadLowerBoundRatio             float64
-	LoadThresholdMetPercentage      float64
-	LoadMetricRingSize              int
-	LoadEvictionCoolDownTime        time.Duration
-	EnableSuppressionEviction       bool
-	MaxSuppressionToleranceRate     float64
-	MinSuppressionToleranceDuration time.Duration
-	GracePeriod                     int64
-	NumaCPUPressureEvictionOptions  NumaCPUPressureEvictionOptions
+	EnableLoadEviction                bool
+	LoadUpperBoundRatio               float64
+	LoadLowerBoundRatio               float64
+	LoadThresholdMetPercentage        float64
+	LoadMetricRingSize                int
+	LoadEvictionCoolDownTime          time.Duration
+	EnableSuppressionEviction         bool
+	MaxSuppressionToleranceRate       float64
+	MinSuppressionToleranceDuration   time.Duration
+	GracePeriod                       int64
+	NumaCPUPressureEvictionOptions    NumaCPUPressureEvictionOptions
+	NumaSysCPUPressureEvictionOptions NumaSysCPUPressureEvictionOptions
 }
 
 // NewCPUPressureEvictionOptions returns a new CPUPressureEvictionOptions
 func NewCPUPressureEvictionOptions() *CPUPressureEvictionOptions {
 	return &CPUPressureEvictionOptions{
-		EnableLoadEviction:              defaultEnableLoadEviction,
-		LoadUpperBoundRatio:             defaultLoadUpperBoundRatio,
-		LoadLowerBoundRatio:             defaultLoadLowerBoundRatio,
-		LoadThresholdMetPercentage:      defaultLoadThresholdMetPercentage,
-		LoadMetricRingSize:              defaultLoadMetricSize,
-		LoadEvictionCoolDownTime:        defaultLoadEvictionCoolDownTime,
-		EnableSuppressionEviction:       defaultEnableSuppressionEviction,
-		MaxSuppressionToleranceRate:     defaultMaxSuppressionToleranceRate,
-		MinSuppressionToleranceDuration: defaultMinSuppressionToleranceDuration,
-		GracePeriod:                     defaultGracePeriod,
-		NumaCPUPressureEvictionOptions:  NewNumaCPUPressureEvictionOptions(),
+		EnableLoadEviction:                defaultEnableLoadEviction,
+		LoadUpperBoundRatio:               defaultLoadUpperBoundRatio,
+		LoadLowerBoundRatio:               defaultLoadLowerBoundRatio,
+		LoadThresholdMetPercentage:        defaultLoadThresholdMetPercentage,
+		LoadMetricRingSize:                defaultLoadMetricSize,
+		LoadEvictionCoolDownTime:          defaultLoadEvictionCoolDownTime,
+		EnableSuppressionEviction:         defaultEnableSuppressionEviction,
+		MaxSuppressionToleranceRate:       defaultMaxSuppressionToleranceRate,
+		MinSuppressionToleranceDuration:   defaultMinSuppressionToleranceDuration,
+		GracePeriod:                       defaultGracePeriod,
+		NumaCPUPressureEvictionOptions:    NewNumaCPUPressureEvictionOptions(),
+		NumaSysCPUPressureEvictionOptions: NewNumaSysCPUPressureEvictionOptions(),
 	}
 }
 
@@ -99,6 +101,7 @@ func (o *CPUPressureEvictionOptions) AddFlags(fss *cliflag.NamedFlagSets) {
 		"the ratio between the times metric value over the bound value and the metric ring size is greater than this percentage "+
 			", the eviction or node taint will be triggered")
 	o.NumaCPUPressureEvictionOptions.AddFlags(fss)
+	o.NumaSysCPUPressureEvictionOptions.AddFlags(fss)
 }
 
 func (o *CPUPressureEvictionOptions) ApplyTo(c *eviction.CPUPressureEvictionConfiguration) error {
@@ -116,6 +119,8 @@ func (o *CPUPressureEvictionOptions) ApplyTo(c *eviction.CPUPressureEvictionConf
 	if err := o.NumaCPUPressureEvictionOptions.ApplyTo(&c.NumaCPUPressureEvictionConfiguration); err != nil {
 		return err
 	}
-
+	if err := o.NumaSysCPUPressureEvictionOptions.ApplyTo(&c.NumaSysCPUPressureEvictionConfiguration); err != nil {
+		return err
+	}
 	return nil
 }

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

@@ -0,0 +1,95 @@
+/*
+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 eviction
+
+import (
+	cliflag "k8s.io/component-base/cli/flag"
+
+	"github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic/adminqos/eviction"
+)
+
+type NumaSysCPUPressureEvictionOptions struct {
+	EnableEviction bool
+	MetricRingSize int
+	GracePeriod    int64
+	SyncPeriod     int64
+
+	ThresholdMetPercentage                 float64
+	NumaCPUUsageSoftThreshold              float64
+	NumaCPUUsageHardThreshold              float64
+	NUMASysOverTotalUsageSoftThreshold     float64
+	NUMASysOverTotalUsageHardThreshold     float64
+	NUMASysOverTotalUsageEvictionThreshold float64
+}
+
+func NewNumaSysCPUPressureEvictionOptions() NumaSysCPUPressureEvictionOptions {
+	return NumaSysCPUPressureEvictionOptions{
+		EnableEviction: false,
+		MetricRingSize: 4,
+		GracePeriod:    60,
+		SyncPeriod:     10,
+
+		ThresholdMetPercentage:                 0.7,
+		NumaCPUUsageSoftThreshold:              0.4,
+		NumaCPUUsageHardThreshold:              0.5,
+		NUMASysOverTotalUsageSoftThreshold:     0.4,
+		NUMASysOverTotalUsageHardThreshold:     0.5,
+		NUMASysOverTotalUsageEvictionThreshold: 0.3,
+	}
+}
+
+func (o *NumaSysCPUPressureEvictionOptions) AddFlags(fss *cliflag.NamedFlagSets) {
+	fs := fss.FlagSet("numa-sys-cpu-pressure-eviction")
+
+	fs.BoolVar(&o.EnableEviction, "numa-sys-cpu-pressure-eviction-enable", o.EnableEviction,
+		"Enable numa system cpu pressure eviction")
+	fs.IntVar(&o.MetricRingSize, "numa-sys-cpu-pressure-eviction-metric-ring-size", o.MetricRingSize,
+		"The size of the metric ring for NUMA system CPU pressure")
+	fs.Int64Var(&o.GracePeriod, "numa-sys-cpu-pressure-eviction-grace-period", o.GracePeriod,
+		"The grace period (in seconds) before evicting pods due to NUMA system CPU pressure")
+	fs.Int64Var(&o.SyncPeriod, "numa-sys-cpu-pressure-eviction-sync-period", o.SyncPeriod,
+		"The sync period (in seconds) for NUMA system CPU pressure eviction")
+
+	fs.Float64Var(&o.ThresholdMetPercentage, "numa-sys-cpu-pressure-eviction-threshold-met-percentage", o.ThresholdMetPercentage,
+		"The percentage of NUMA nodes whose system CPU pressure meets the threshold to trigger eviction")
+	fs.Float64Var(&o.NumaCPUUsageSoftThreshold, "numa-sys-cpu-pressure-eviction-numa-cpu-usage-soft-threshold", o.NumaCPUUsageSoftThreshold,
+		"The soft threshold of NUMA node system CPU usage ratio")
+	fs.Float64Var(&o.NumaCPUUsageHardThreshold, "numa-sys-cpu-pressure-eviction-numa-cpu-usage-hard-threshold", o.NumaCPUUsageHardThreshold,
+		"The hard threshold of NUMA node system CPU usage ratio")
+	fs.Float64Var(&o.NUMASysOverTotalUsageSoftThreshold, "numa-sys-cpu-pressure-eviction-numa-sys-over-total-usage-soft-threshold", o.NUMASysOverTotalUsageSoftThreshold,
+		"The soft threshold of NUMA node system CPU pressure over total system CPU usage ratio")
+	fs.Float64Var(&o.NUMASysOverTotalUsageHardThreshold, "numa-sys-cpu-pressure-eviction-numa-sys-over-total-usage-hard-threshold", o.NUMASysOverTotalUsageHardThreshold,
+		"The hard threshold of NUMA node system CPU pressure over total system CPU usage ratio")
+	fs.Float64Var(&o.NUMASysOverTotalUsageEvictionThreshold, "numa-sys-cpu-pressure-eviction-numa-sys-over-total-usage-eviction-threshold", o.NUMASysOverTotalUsageEvictionThreshold,
+		"The eviction threshold of NUMA node system CPU pressure over total system CPU usage ratio")
+}
+
+func (o *NumaSysCPUPressureEvictionOptions) ApplyTo(c *eviction.NumaSysCPUPressureEvictionConfiguration) error {
+	c.EnableEviction = o.EnableEviction
+	c.MetricRingSize = o.MetricRingSize
+	c.GracePeriod = o.GracePeriod
+	c.SyncPeriod = o.SyncPeriod
+
+	c.ThresholdMetPercentage = o.ThresholdMetPercentage
+	c.NumaCPUUsageSoftThreshold = o.NumaCPUUsageSoftThreshold
+	c.NumaCPUUsageHardThreshold = o.NumaCPUUsageHardThreshold
+	c.NUMASysOverTotalUsageSoftThreshold = o.NUMASysOverTotalUsageSoftThreshold
+	c.NUMASysOverTotalUsageHardThreshold = o.NUMASysOverTotalUsageHardThreshold
+	c.NUMASysOverTotalUsageEvictionThreshold = o.NUMASysOverTotalUsageEvictionThreshold
+
+	return nil
+}

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/h2non/gock v1.2.0
 	github.com/klauspost/cpuid/v2 v2.2.6
-	github.com/kubewharf/katalyst-api v0.5.8-0.20251208194138-ba8b11c02f5b
+	github.com/kubewharf/katalyst-api v0.5.8-0.20251209195727-bde2ce2b9b13
 	github.com/moby/sys/mountinfo v0.6.2
 	github.com/montanaflynn/stats v0.7.1
 	github.com/opencontainers/runc v1.1.6

go.sum

@@ -576,8 +576,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubewharf/katalyst-api v0.5.8-0.20251208194138-ba8b11c02f5b h1:8mB1GVGkhS0Fs60BCSyh/ytmHt5eD6LrFoQaC4O9iuM=
-github.com/kubewharf/katalyst-api v0.5.8-0.20251208194138-ba8b11c02f5b/go.mod h1:Y2IeIorxQamF2a3oa0+URztl5QCSty6Jj3zD83R8J9k=
+github.com/kubewharf/katalyst-api v0.5.8-0.20251209195727-bde2ce2b9b13 h1:/R3HuWFoJkynuCnYF7wZ9p9KkzUgYgtDXZlxCeggMgM=
+github.com/kubewharf/katalyst-api v0.5.8-0.20251209195727-bde2ce2b9b13/go.mod h1:Y2IeIorxQamF2a3oa0+URztl5QCSty6Jj3zD83R8J9k=
 github.com/kubewharf/kubelet v1.24.6-kubewharf.9 h1:jOTYZt7h/J7I8xQMKMUcJjKf5UFBv37jHWvNp5VRFGc=
 github.com/kubewharf/kubelet v1.24.6-kubewharf.9/go.mod h1:MxbSZUx3wXztFneeelwWWlX7NAAStJ6expqq7gY2J3c=
 github.com/kyoh86/exportloopref v0.1.7/go.mod h1:h1rDl2Kdj97+Kwh4gdz3ujE7XHmH51Q0lUiZ1z4NLj8=

pkg/agent/evictionmanager/manager.go

@@ -453,7 +453,6 @@ func (m *EvictionManger) collectEvictionResult(ctx context.Context, pods []*v1.P
 				}
 			}
 		}
-
 		resp, err := m.endpoints[pluginName].GetTopEvictionPods(context.Background(), &pluginapi.GetTopEvictionPodsRequest{
 			ActivePods:               activePods,
 			TopN:                     1,

pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/cpu_eviciton.go

@@ -36,6 +36,7 @@ func init() {
 	RegisterCPUEvictionInitializer(strategy.EvictionNameLoad, strategy.NewCPUPressureLoadEviction)
 	RegisterCPUEvictionInitializer(strategy.EvictionNameSuppression, strategy.NewCPUPressureSuppressionEviction)
 	RegisterCPUEvictionInitializer(strategy.EvictionNameNumaCpuPressure, strategy.NewCPUPressureUsageEviction)
+	RegisterCPUEvictionInitializer(strategy.EvictionNameNumaSysCpuPressure, strategy.NewSysCPUPressureUsageEviction)
 }
 
 var cpuEvictionInitializers sync.Map

pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/rules/types.go

@@ -50,6 +50,17 @@ type NumaOverStat struct {
 	Gap            float64
 }
 
+type NumaSysOverStat struct {
+	NumaID             int
+	NumaCPUUsageAvg    float64
+	NumaSysCPUUsageAvg float64
+
+	IsNumaCPUUsageSoftOver    bool
+	IsNumaCPUUsageHardOver    bool
+	IsNumaSysCPUUsageSoftOver bool
+	IsNumaSysCPUUsageHardOver bool
+}
+
 type EvictOptions struct {
 	NumaPressureConfig *NumaPressureConfig
 	State              State