@@ -36,9 +36,12 @@ import (
3636 "github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/plugin/qosaware/reporter/manager/resource"
3737 hmadvisor "github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/plugin/qosaware/resource"
3838 "github.com/kubewharf/katalyst-core/pkg/config"
39+ "github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic"
3940 "github.com/kubewharf/katalyst-core/pkg/metaserver"
4041 "github.com/kubewharf/katalyst-core/pkg/metrics"
4142 "github.com/kubewharf/katalyst-core/pkg/util"
43+ "github.com/kubewharf/katalyst-core/pkg/util/general"
44+ "github.com/kubewharf/katalyst-core/pkg/util/native"
4245)
4346
4447func init () {
@@ -50,6 +53,10 @@ const (
5053 headroomReporterPluginName = "headroom-reporter-plugin"
5154)
5255
56+ const (
57+ metricsNameReclaimedResourceRevised = "reclaimed_resource_revised"
58+ )
59+
5360type HeadroomResourceManager interface {
5461 manager.ResourceManager
5562 manager.NumaResourceManager
@@ -111,16 +118,21 @@ type reclaimedResource struct {
111118 capacity v1.ResourceList
112119 numaAllocatable map [int ]v1.ResourceList
113120 numaCapacity map [int ]v1.ResourceList
121+
122+ resourceNameMap map [v1.ResourceName ]v1.ResourceName
123+ milliValue map [v1.ResourceName ]bool
114124}
115125
116126type headroomReporterPlugin struct {
117127 sync.Mutex
118128 headroomManagers map [v1.ResourceName ]manager.HeadroomManager
119129 numaSocketZoneNodeMap map [util.ZoneNode ]util.ZoneNode
120130
121- ctx context.Context
122- cancel context.CancelFunc
123- started bool
131+ dynamicConf * dynamic.DynamicAgentConfiguration
132+ ctx context.Context
133+ cancel context.CancelFunc
134+ emitter metrics.MetricEmitter
135+ started bool
124136}
125137
126138func newHeadroomReporterPlugin (emitter metrics.MetricEmitter , metaServer * metaserver.MetaServer ,
@@ -131,6 +143,11 @@ func newHeadroomReporterPlugin(emitter metrics.MetricEmitter, metaServer *metase
131143 errList []error
132144 )
133145
146+ // init numa topo info by metaServer
147+ if metaServer == nil || metaServer .MachineInfo == nil {
148+ return nil , nil , fmt .Errorf ("get metaserver machine info is nil" )
149+ }
150+
134151 initializers := manager .GetRegisteredManagerInitializers ()
135152 headroomManagers := make (map [v1.ResourceName ]manager.HeadroomManager , len (initializers ))
136153 for name , initializer := range initializers {
@@ -140,18 +157,15 @@ func newHeadroomReporterPlugin(emitter metrics.MetricEmitter, metaServer *metase
140157 }
141158 }
142159
143- // init numa topo info by metaServer
144- if metaServer == nil || metaServer .MachineInfo == nil {
145- errList = append (errList , fmt .Errorf ("get metaserver machine info is nil" ))
146- }
147-
148160 if len (errList ) > 0 {
149161 return nil , nil , errors .NewAggregate (errList )
150162 }
151163
152164 reporter := & headroomReporterPlugin {
153165 headroomManagers : headroomManagers ,
154166 numaSocketZoneNodeMap : util .GenerateNumaSocketZone (metaServer .MachineInfo .Topology ),
167+ dynamicConf : conf .DynamicAgentConfiguration ,
168+ emitter : emitter ,
155169 }
156170 pluginWrapper , err := skeleton .NewRegistrationPluginWrapper (reporter , []string {conf .PluginRegistrationDir },
157171 func (key string , value int64 ) {
@@ -223,6 +237,12 @@ func (r *headroomReporterPlugin) GetReportContent(_ context.Context, _ *v1alpha1
223237 return nil , err
224238 }
225239
240+ // revise reclaimed resource to avoid resource fragmentation
241+ err = r .reviseReclaimedResource (res )
242+ if err != nil {
243+ return nil , err
244+ }
245+
226246 reportToCNR , err := r .getReportReclaimedResourceForCNR (res )
227247 if err != nil {
228248 return nil , err
@@ -256,47 +276,51 @@ func (r *headroomReporterPlugin) getReclaimedResource() (*reclaimedResource, err
256276 capacity := make (v1.ResourceList )
257277 numaAllocatable := make (map [int ]v1.ResourceList )
258278 numaCapacity := make (map [int ]v1.ResourceList )
259- for resourceName , rm := range r .headroomManagers {
260- allocatable [resourceName ], err = rm .GetAllocatable ()
279+ resourceNameMap := make (map [v1.ResourceName ]v1.ResourceName )
280+ milliValue := make (map [v1.ResourceName ]bool )
281+ for reportName , rm := range r .headroomManagers {
282+ // get origin resource name
283+ resourceNameMap [reportName ] = rm .Name ()
284+ milliValue [reportName ] = rm .MilliValue ()
285+ allocatable [reportName ], err = rm .GetAllocatable ()
261286 if err != nil {
262- errList = append (errList , fmt .Errorf ("get reclaimed %s allocatable failed: %s" , resourceName , err ))
287+ errList = append (errList , fmt .Errorf ("get reclaimed %s allocatable failed: %s" , reportName , err ))
263288 }
264289
265- capacity [resourceName ], err = rm .GetCapacity ()
290+ capacity [reportName ], err = rm .GetCapacity ()
266291 if err != nil {
267- errList = append (errList , err , fmt .Errorf ("get reclaimed %s capacity failed: %s" , resourceName , err ))
292+ errList = append (errList , err , fmt .Errorf ("get reclaimed %s capacity failed: %s" , reportName , err ))
268293 }
269294
270295 // get allocatable per numa
271296 allocatableMap , err := rm .GetNumaAllocatable ()
272297 if err != nil {
273- errList = append (errList , fmt .Errorf ("get reclaimed %s numa allocatable failed: %s" , resourceName , err ))
298+ errList = append (errList , fmt .Errorf ("get reclaimed %s numa allocatable failed: %s" , reportName , err ))
274299 } else {
275300 for numaID , quantity := range allocatableMap {
276301 perNumaAllocatable , ok := numaAllocatable [numaID ]
277302 if ! ok {
278303 perNumaAllocatable = make (v1.ResourceList )
279304 numaAllocatable [numaID ] = perNumaAllocatable
280305 }
281- perNumaAllocatable [resourceName ] = quantity
306+ perNumaAllocatable [reportName ] = quantity
282307 }
283308 }
284309
285310 // get capacity per numa
286311 capacityMap , err := rm .GetNumaCapacity ()
287312 if err != nil {
288- errList = append (errList , fmt .Errorf ("get reclaimed %s numa capacity failed: %s" , resourceName , err ))
313+ errList = append (errList , fmt .Errorf ("get reclaimed %s numa capacity failed: %s" , reportName , err ))
289314 } else {
290315 for numaID , quantity := range capacityMap {
291316 perNumaCapacity , ok := numaCapacity [numaID ]
292317 if ! ok {
293318 perNumaCapacity = make (v1.ResourceList )
294319 numaCapacity [numaID ] = perNumaCapacity
295320 }
296- perNumaCapacity [resourceName ] = quantity
321+ perNumaCapacity [reportName ] = quantity
297322 }
298323 }
299-
300324 }
301325
302326 if len (errList ) > 0 {
@@ -308,7 +332,9 @@ func (r *headroomReporterPlugin) getReclaimedResource() (*reclaimedResource, err
308332 capacity : capacity ,
309333 numaAllocatable : numaAllocatable ,
310334 numaCapacity : numaCapacity ,
311- }, err
335+ milliValue : milliValue ,
336+ resourceNameMap : resourceNameMap ,
337+ }, nil
312338}
313339
314340func (r * headroomReporterPlugin ) getReportReclaimedResourceForCNR (reclaimedResource * reclaimedResource ) (* v1alpha1.ReportContent , error ) {
@@ -385,3 +411,67 @@ func (r *headroomReporterPlugin) getReportNUMAReclaimedResource(reclaimedResourc
385411 Value : value ,
386412 }, nil
387413}
414+
415+ func (r * headroomReporterPlugin ) reviseReclaimedResource (res * reclaimedResource ) error {
416+ if res == nil {
417+ return fmt .Errorf ("reclaimed resource is nil" )
418+ }
419+
420+ conf := r .dynamicConf .GetDynamicConfiguration ()
421+ reviseFunc := func (resList v1.ResourceList ) bool {
422+ revise := false
423+ for reportName , quantity := range resList {
424+ resourceName , ok := res .resourceNameMap [reportName ]
425+ if ! ok {
426+ resourceName = reportName
427+ }
428+
429+ minIgnored , ok := conf .MinIgnoredReclaimedResourceForReport [resourceName ]
430+ if ok {
431+ milliValue , ok := res .milliValue [reportName ]
432+ if ok && milliValue {
433+ minIgnored = * apiresource .NewQuantity (minIgnored .MilliValue (), minIgnored .Format )
434+ }
435+
436+ if quantity .Cmp (minIgnored ) <= 0 {
437+ revise = true
438+ break
439+ }
440+ }
441+ }
442+
443+ if revise {
444+ for resourceName := range resList {
445+ resList [resourceName ] = apiresource.Quantity {}
446+ }
447+ }
448+
449+ return revise
450+ }
451+
452+ numaRevised := false
453+ for numaID := range res .numaAllocatable {
454+ if reviseFunc (res .numaAllocatable [numaID ]) {
455+ numaRevised = true
456+ }
457+ }
458+
459+ if numaRevised {
460+ sumNUMAAllocatable := v1.ResourceList {}
461+ for _ , allocatable := range res .numaAllocatable {
462+ sumNUMAAllocatable = native .AddResources (sumNUMAAllocatable , allocatable )
463+ }
464+ res .allocatable = sumNUMAAllocatable
465+ }
466+
467+ revised := reviseFunc (res .allocatable )
468+ if numaRevised || revised {
469+ general .InfoS ("revised result" ,
470+ "allocatable" , res .allocatable ,
471+ "capacity" , res .capacity ,
472+ "numaAllocatable" , res .numaAllocatable ,
473+ "numaCapacity" , res .numaCapacity )
474+ _ = r .emitter .StoreInt64 (metricsNameReclaimedResourceRevised , 1 , metrics .MetricTypeNameRaw )
475+ }
476+ return nil
477+ }
0 commit comments