Skip to content

Commit 1f16f6c

Browse files
committed
chore(sysadvisor): add revised result log and metrics
1 parent 8cdecfe commit 1f16f6c

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

pkg/agent/sysadvisor/plugin/qosaware/reporter/headroom_reporter.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
"github.com/kubewharf/katalyst-core/pkg/metaserver"
4141
"github.com/kubewharf/katalyst-core/pkg/metrics"
4242
"github.com/kubewharf/katalyst-core/pkg/util"
43+
"github.com/kubewharf/katalyst-core/pkg/util/general"
4344
"github.com/kubewharf/katalyst-core/pkg/util/native"
4445
)
4546

@@ -52,6 +53,10 @@ const (
5253
headroomReporterPluginName = "headroom-reporter-plugin"
5354
)
5455

56+
const (
57+
metricsNameReclaimedResourceRevised = "reclaimed_resource_revised"
58+
)
59+
5560
type HeadroomResourceManager interface {
5661
manager.ResourceManager
5762
manager.NumaResourceManager
@@ -126,6 +131,7 @@ type headroomReporterPlugin struct {
126131
dynamicConf *dynamic.DynamicAgentConfiguration
127132
ctx context.Context
128133
cancel context.CancelFunc
134+
emitter metrics.MetricEmitter
129135
started bool
130136
}
131137

@@ -159,6 +165,7 @@ func newHeadroomReporterPlugin(emitter metrics.MetricEmitter, metaServer *metase
159165
headroomManagers: headroomManagers,
160166
numaSocketZoneNodeMap: util.GenerateNumaSocketZone(metaServer.MachineInfo.Topology),
161167
dynamicConf: conf.DynamicAgentConfiguration,
168+
emitter: emitter,
162169
}
163170
pluginWrapper, err := skeleton.NewRegistrationPluginWrapper(reporter, []string{conf.PluginRegistrationDir},
164171
func(key string, value int64) {
@@ -457,6 +464,14 @@ func (r *headroomReporterPlugin) reviseReclaimedResource(res *reclaimedResource)
457464
res.allocatable = sumNUMAAllocatable
458465
}
459466

460-
reviseFunc(res.allocatable)
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+
}
461476
return nil
462477
}

pkg/agent/sysadvisor/plugin/qosaware/reporter/headroom_reporter_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ func TestReviseReclaimedResource(t *testing.T) {
737737

738738
r := &headroomReporterPlugin{
739739
dynamicConf: dynamic.NewDynamicAgentConfiguration(),
740+
emitter: metrics.DummyMetrics{},
740741
}
741742

742743
if tt.setupConf != nil {

0 commit comments

Comments
 (0)