gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 17:54:44 +08:00
Code

fix: Fix the problem of incorrect calculation of container memory res… (#8125)

Browse Source 
Refs #8033
This commit is contained in:
ssongliu 2025-03-12 10:13:03 +08:00 committed by GitHub
parent 8f491b2933
commit 51fe02661f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/app/service/container.go
View File

@ -941,21 +941,21 @@ func calculateCPUPercentUnix(stats *types.StatsJSON) float64 {
func calculateMemPercentUnix(memStats types.MemoryStats) float64 { func calculateMemPercentUnix(memStats types.MemoryStats) float64 {
memPercent := 0.0 memPercent := 0.0
memUsage := calculateMemUsageUnixNoCache(memStats) memUsage := calculateMemUsageUnixNoCache(memStats)
memLimit := float64(memStats.Limit) memLimit := memStats.Limit
if memUsage > 0.0 && memLimit > 0.0 { if memUsage > 0.0 && memLimit > 0.0 {
memPercent = (memUsage / memLimit) * 100.0 memPercent = (float64(memUsage) / float64(memLimit)) * 100.0
} }
return memPercent return memPercent
} }
func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 { func calculateMemUsageUnixNoCache(mem types.MemoryStats) uint64 {
if v, isCgroup1 := mem.Stats["total_inactive_file"]; isCgroup1 && v < mem.Usage { if v, isCgroup1 := mem.Stats["total_inactive_file"]; isCgroup1 && v < mem.Usage {
return float64(mem.Usage - v) return mem.Usage - v
} }
if v := mem.Stats["inactive_file"]; v < mem.Usage { if v := mem.Stats["inactive_file"]; v < mem.Usage {
return float64(mem.Usage - v) return mem.Usage - v
} }
return float64(mem.Usage) return mem.Usage
} }
func calculateBlockIO(blkio types.BlkioStats) (blkRead float64, blkWrite float64) { func calculateBlockIO(blkio types.BlkioStats) (blkRead float64, blkWrite float64) {
@ -1075,7 +1075,7 @@ func loadCpuAndMem(client *client.Client, container string) dto.ContainerListSta
data.PercpuUsage = len(stats.CPUStats.CPUUsage.PercpuUsage) data.PercpuUsage = len(stats.CPUStats.CPUUsage.PercpuUsage)
data.MemoryCache = stats.MemoryStats.Stats["cache"] data.MemoryCache = stats.MemoryStats.Stats["cache"]
data.MemoryUsage = stats.MemoryStats.Usage data.MemoryUsage = calculateMemUsageUnixNoCache(stats.MemoryStats)
data.MemoryLimit = stats.MemoryStats.Limit data.MemoryLimit = stats.MemoryStats.Limit
data.MemoryPercent = calculateMemPercentUnix(stats.MemoryStats) data.MemoryPercent = calculateMemPercentUnix(stats.MemoryStats)