Skip to content

Commit 42377c1

Browse files
committed
feat(sysadvisor): log
1 parent ecbcdbe commit 42377c1

2 files changed

Lines changed: 55 additions & 1 deletion

File tree

‎pkg/agent/resourcemanager/reporter/cnr/cnrreporter.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,12 @@ func (c *cnrReporterImpl) tryUpdateCNRStatus(ctx context.Context,
329329
if cnrStatusHasChanged(&originCNR.Status, &currentCNR.Status) {
330330
klog.Infof("cnr status changed, try to patch it")
331331

332+
if currentCNR.Status.NodeMetricStatus != nil {
333+
klog.Infof("cnr status patch nodeMetricStatus: genericUsage=%+v groupMetric=%+v",
334+
currentCNR.Status.NodeMetricStatus.NodeMetric,
335+
currentCNR.Status.NodeMetricStatus.GroupMetric)
336+
}
337+
332338
begin := time.Now()
333339
defer func() {
334340
costs := time.Since(begin)
@@ -347,6 +353,12 @@ func (c *cnrReporterImpl) tryUpdateCNRStatus(ctx context.Context,
347353
return nil, err
348354
}
349355

356+
if cnr != nil && cnr.Status.NodeMetricStatus != nil {
357+
klog.Infof("cnr status patch success: nodeMetric=%+v groupMetric=%+v",
358+
cnr.Status.NodeMetricStatus.NodeMetric,
359+
cnr.Status.NodeMetricStatus.GroupMetric)
360+
}
361+
350362
c.countMetricsWithBaseTags("reporter_update",
351363
metrics.ConvertMapToTags(map[string]string{
352364
"field": "status",

‎pkg/agent/sysadvisor/plugin/qosaware/reporter/nodemetric_reporter.go‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,38 @@ func (p *nodeMetricsReporterPlugin) updateNodeMetrics() {
275275
GroupMetric: groupMetricInfo,
276276
}
277277

278+
if nodeMetricInfo != nil {
279+
general.Infof("node metric generic usage: cpu=%v memory=%v memoryBandwidth=%v",
280+
nodeMetricInfo.GenericUsage.CPU,
281+
nodeMetricInfo.GenericUsage.Memory,
282+
nodeMetricInfo.GenericUsage.MemoryBandwidth)
283+
284+
for _, numaMetric := range nodeMetricInfo.NUMAUsage {
285+
general.Infof("node metric numa usage: numa=%d cpu=%v memory=%v memoryBandwidth=%v",
286+
numaMetric.NUMAId,
287+
numaMetric.Usage.CPU,
288+
numaMetric.Usage.Memory,
289+
numaMetric.Usage.MemoryBandwidth)
290+
}
291+
}
292+
for _, gm := range groupMetricInfo {
293+
general.Infof("group metric generic usage: qos=%s cpu=%v memory=%v memoryBandwidth=%v podList=%v",
294+
gm.QoSLevel,
295+
gm.GenericUsage.CPU,
296+
gm.GenericUsage.Memory,
297+
gm.GenericUsage.MemoryBandwidth,
298+
gm.PodList)
299+
300+
for _, numaMetric := range gm.NUMAUsage {
301+
general.Infof("group metric numa usage: qos=%s numa=%d cpu=%v memory=%v memoryBandwidth=%v",
302+
gm.QoSLevel,
303+
numaMetric.NUMAId,
304+
numaMetric.Usage.CPU,
305+
numaMetric.Usage.Memory,
306+
numaMetric.Usage.MemoryBandwidth)
307+
}
308+
}
309+
278310
p.RWMutex.Lock()
279311
defer p.RWMutex.Unlock()
280312
p.nodeMetricStatus = &nms
@@ -503,6 +535,15 @@ func (p *nodeMetricsReporterPlugin) getPodUsage(pod *v1.Pod) (v1.ResourceList, m
503535
cpu := resource.NewMilliQuantity(int64(podCPUUsage*1000), resource.DecimalSI)
504536
memory := resource.NewQuantity(int64(podMemUsage), resource.BinarySI)
505537

538+
general.Infof("pod usage summary: pod=%s cpu=%v memory=%v memoryBandwidth=%v numaUsage=%v assignedNUMAs=%v rampUp=%v",
539+
pod.Name,
540+
cpu,
541+
memory,
542+
podMemoryBandwidthUsage,
543+
numaUsage,
544+
assignedNUMAs.String(),
545+
rampUp)
546+
506547
return v1.ResourceList{
507548
v1.ResourceMemory: *memory,
508549
v1.ResourceCPU: *cpu,
@@ -653,7 +694,8 @@ func (p *nodeMetricsReporterPlugin) getGroupUsage(pods []*v1.Pod, qosLevel strin
653694
}
654695

655696
klog.InfoS("group usage", "qosLevel", qosLevel, "memory", general.FormatMemoryQuantity(memory.AsApproximateFloat64()),
656-
"aggMemory", general.FormatMemoryQuantity(aggMemory.AsApproximateFloat64()), "cpu", cpu.AsApproximateFloat64(), "aggCPU", aggCPU.AsApproximateFloat64())
697+
"aggMemory", general.FormatMemoryQuantity(aggMemory.AsApproximateFloat64()), "cpu", cpu.AsApproximateFloat64(), "aggCPU", aggCPU.AsApproximateFloat64(),
698+
"memoryBandwidth", general.FormatMemoryQuantity(memoryBandwidth.AsApproximateFloat64()))
657699

658700
return resourceMetric, resourceNUMAMetrics, effectivePods, nil
659701
}

0 commit comments

Comments
 (0)