Skip to content

Commit 7263851

Browse files
authored
Merge pull request #649 from cheney-lin/dev/tmo
chore(tmo): add more logs
2 parents a449bc9 + 1bf6415 commit 7263851

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pkg/agent/sysadvisor/plugin/qosaware/resource/memory/plugin/memory_offloading.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"math"
2222
"path/filepath"
2323
"strconv"
24+
"strings"
2425
"sync"
2526
"time"
2627

@@ -64,6 +65,7 @@ var tmoPolicyFuncs sync.Map
6465
var tmoBlockFuncs sync.Map
6566

6667
type TmoStats struct {
68+
obj string
6769
memUsage float64
6870
memInactive float64
6971
memPsiAvg60 float64
@@ -109,7 +111,7 @@ func refaultPolicyFunc(lastStats TmoStats, currStats TmoStats, conf *tmoconf.TMO
109111
// which means reclaim accuracy and reclaim scan efficiency is low.
110112
result = math.Min(math.Max(lastStats.offloadingTargetSize*OffloadingSizeScaleCoeff, currStats.memInactive*InactiveProbe), currStats.memUsage*conf.RefaultPolicyConf.MaxProbe)
111113
}
112-
general.InfoS("refault info", "reclaimAccuracyRatio", reclaimAccuracyRatio, "ReclaimAccuracyTarget", conf.RefaultPolicyConf.ReclaimAccuracyTarget,
114+
general.InfoS("refault info", "obj", currStats.obj, "reclaimAccuracyRatio", reclaimAccuracyRatio, "ReclaimAccuracyTarget", conf.RefaultPolicyConf.ReclaimAccuracyTarget,
113115
"reclaimScanEfficiencyRatio", reclaimScanEfficiencyRatio, "ReclaimScanEfficiencyTarget", conf.RefaultPolicyConf.ReclaimScanEfficiencyTarget,
114116
"refaultDelta", refaultDelta, "pgstealDelta", pgstealDelta, "pgscanDelta", pgscanDelta, "lastOffloadingTargetSize", general.FormatMemoryQuantity(lastStats.offloadingTargetSize),
115117
"result", general.FormatMemoryQuantity(result))
@@ -287,8 +289,10 @@ func (tmoEngine *tmoEngineInstance) getStats() (TmoStats, error) {
287289

288290
if tmoEngine.containerInfo == nil {
289291
err = getCgroupMetrics(tmoEngine.metaServer, tmoEngine.cgpath)
292+
tmoStats.obj = tmoEngine.cgpath
290293
} else {
291294
err = getContainerMetrics(tmoEngine.metaServer, tmoEngine.containerInfo.PodUID, tmoEngine.containerInfo.ContainerName)
295+
tmoStats.obj = strings.Join([]string{tmoEngine.containerInfo.PodNamespace, tmoEngine.containerInfo.PodName}, "/")
292296
}
293297
return *tmoStats, err
294298
}

0 commit comments

Comments
 (0)