Merge pull request #963 from zhanghaoyu1986/dev/irq-tuning-metrics-enhancement

Dev/irq tuning metrics enhancement

Author: xu282934741

pkg/agent/qrm-plugins/cpu/dynamicpolicy/irqtuner/controller/controller.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"math"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -1641,7 +1642,8 @@ func (ic *IrqTuningController) emitIrqTuningPolicy() {
 		irqTuningPolicyMetricVal = -1
 	}
 
-	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningPolicy, irqTuningPolicyMetricVal, metrics.MetricTypeNameRaw)
+	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningPolicy, irqTuningPolicyMetricVal, metrics.MetricTypeNameRaw,
+		metrics.MetricTag{Key: "irq_tuning_policy", Val: string(ic.conf.IrqTuningPolicy)})
 }
 
 func (ic *IrqTuningController) emitNicsIrqAffinityPolicy() {
@@ -1652,9 +1654,12 @@ func (ic *IrqTuningController) emitNicsIrqAffinityPolicy() {
 			val = 0
 		} else if nic.IrqAffinityPolicy == IrqCoresExclusive {
 			val = 1
+		} else {
+			general.Errorf("%s nic %s irq affinity policy %s is unexpected", IrqTuningLogPrefix, nic.NicInfo, nic.IrqAffinityPolicy)
 		}
 		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningNicIrqAffinityPolicy, val, metrics.MetricTypeNameRaw,
-			metrics.MetricTag{Key: "nic", Val: nic.NicInfo.UniqName()})
+			metrics.MetricTag{Key: "nic", Val: nic.NicInfo.UniqName()},
+			metrics.MetricTag{Key: "irq_affinity_policy", Val: string(nic.IrqAffinityPolicy)})
 	}
 }
 
@@ -2732,6 +2737,8 @@ func (ic *IrqTuningController) tuneNicIrqsAffinityQualifiedCores(nic *NicInfo, i
 					tunedReason = irqtuner.NormalNicsChanged
 				} else {
 					tunedReason = irqtuner.UnexpectedTuning
+					general.Errorf("%s nic %s unexpected balance-fair irq tuning, irqs: %+v, qualifiedCores: %+v",
+						IrqTuningLogPrefix, nic, irqs, qualifiedCoresMap)
 				}
 			} else {
 				tunedReason = irqtuner.NormalTuning
@@ -3515,8 +3522,10 @@ retry:
 	}
 	ic.IrqAffForbiddenContainers = irqAffinityForbiddenContainers
 	ic.SriovContainers = sriovContainers
-	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningSriovContainersCount, int64(len(ic.SriovContainers)), metrics.MetricTypeNameRaw)
-	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningIrqAffForbiddenContainersCount, int64(len(ic.IrqAffForbiddenContainers)), metrics.MetricTypeNameRaw)
+	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningSriovContainersCount, int64(len(ic.SriovContainers)), metrics.MetricTypeNameRaw,
+		metrics.MetricTag{Key: "count", Val: strconv.Itoa(len(ic.SriovContainers))})
+	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningIrqAffForbiddenContainersCount, int64(len(ic.IrqAffForbiddenContainers)), metrics.MetricTypeNameRaw,
+		metrics.MetricTag{Key: "count", Val: strconv.Itoa(len(ic.IrqAffForbiddenContainers))})
 
 	forbiddendCores, err := ic.IrqStateAdapter.GetIRQForbiddenCores()
 	if err != nil {
@@ -5396,12 +5405,14 @@ func (ic *IrqTuningController) periodicTuningIrqBalanceFair() {
 			}
 		}
 
-		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningRPSEnabled, 1, metrics.MetricTypeNameRaw)
+		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningRPSEnabled, 1, metrics.MetricTypeNameRaw,
+			metrics.MetricTag{Key: "enabled", Val: "1"})
 	} else {
 		if err := ic.clearRPSForNics(ic.getAllNics()); err != nil {
 			general.Errorf("%s failed to clearRPSForNics, err %s", IrqTuningLogPrefix, err)
 		}
-		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningRPSEnabled, 0, metrics.MetricTypeNameRaw)
+		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningRPSEnabled, 0, metrics.MetricTypeNameRaw,
+			metrics.MetricTag{Key: "enabled", Val: "0"})
 	}
 
 	// restore ksoftirqd default nice
@@ -5612,10 +5623,12 @@ func (ic *IrqTuningController) periodicTuning() {
 
 	if !ic.conf.EnableIrqTuning {
 		ic.disableIrqTuning()
-		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningEnabled, 0, metrics.MetricTypeNameRaw)
+		_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningEnabled, 0, metrics.MetricTypeNameRaw,
+			metrics.MetricTag{Key: "enabled", Val: "0"})
 		return
 	}
-	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningEnabled, 1, metrics.MetricTypeNameRaw)
+	_ = ic.emitter.StoreInt64(metricUtil.MetricNameIrqTuningEnabled, 1, metrics.MetricTypeNameRaw,
+		metrics.MetricTag{Key: "enabled", Val: "1"})
 
 	switch ic.conf.IrqTuningPolicy {
 	case config.IrqTuningIrqCoresExclusive: