apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-05 07:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong memory limit, add total memory, add cpu and memory consumed by core itself to node resources

Browse Source
This commit is contained in:
Ingo Oppermann
2024-07-25 21:13:49 +02:00
parent e54bb4ee7c
commit d391e274d7
7 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/about.go
View File

@@ -22,8 +22,11 @@ type ClusterNodeResources struct {
NCPU float64 // Number of CPU on this node
CPU float64 // Current CPU load, 0-100*ncpu
CPULimit float64 // Defined CPU load limit, 0-100*ncpu
CPUCore float64 // Current CPU load of the core itself, 0-100*ncpu
Mem uint64 // Currently used memory in bytes
MemLimit uint64 // Defined memory limit in bytes
MemTotal uint64 // Total available memory in bytes
MemCore uint64 // Current used memory of the core itself in bytes
Error error
}
@@ -145,8 +148,11 @@ func (c *cluster) About() (ClusterAbout, error) {
NCPU: nodeAbout.Resources.NCPU,
CPU: nodeAbout.Resources.CPU,
CPULimit: nodeAbout.Resources.CPULimit,
CPUCore: nodeAbout.Resources.CPUCore,
Mem: nodeAbout.Resources.Mem,
MemLimit: nodeAbout.Resources.MemLimit,
MemTotal: nodeAbout.Resources.MemTotal,
MemCore: nodeAbout.Resources.MemCore,
Error: nodeAbout.Resources.Error,
},
}

5
cluster/api.go
View File

@@ -187,8 +187,11 @@ func (a *api) About(c echo.Context) error {
NCPU: resources.CPU.NCPU,
CPU: (100 - resources.CPU.Idle) * resources.CPU.NCPU,
CPULimit: resources.CPU.Limit * resources.CPU.NCPU,
CPUCore: resources.CPU.Core * resources.CPU.NCPU,
Mem: resources.Mem.Total - resources.Mem.Available,
MemLimit: resources.Mem.Total,
MemLimit: resources.Mem.Limit,
MemTotal: resources.Mem.Total,
MemCore: resources.Mem.Core,
},
}

3
cluster/client/client.go
View File

@@ -88,8 +88,11 @@ type AboutResponseResources struct {
NCPU float64 `json:"ncpu"` // Number of CPU on this node
CPU float64 `json:"cpu"` // Current CPU load, 0-100*ncpu
CPULimit float64 `json:"cpu_limit"` // Defined CPU load limit, 0-100*ncpu
CPUCore float64 `json:"cpu_core"` // Current CPU load of the core itself, 0-100*ncpu
Mem uint64 `json:"memory_bytes"` // Currently used memory in bytes
MemLimit uint64 `json:"memory_limit_bytes"` // Defined memory limit in bytes
MemTotal uint64 `json:"memory_total_bytes"` // Total available memory in bytes
MemCore uint64 `json:"memory_core_bytes"` // Current used memory of the core itself in bytes
Error string `json:"error"` // Last error
}

6
cluster/node/node.go
View File

@@ -143,8 +143,11 @@ type Resources struct {
NCPU float64 // Number of CPU on this node
CPU float64 // Current CPU load, 0-100*ncpu
CPULimit float64 // Defined CPU load limit, 0-100*ncpu
CPUCore float64 // Current CPU load of the core itself, 0-100*ncpu
Mem uint64 // Currently used memory in bytes
MemLimit uint64 // Defined memory limit in bytes
MemTotal uint64 // Total available memory in bytes
MemCore uint64 // Current used memory of the core itself in bytes
Error error // Last error
}
@@ -503,8 +506,11 @@ func (n *Node) ping(ctx context.Context, interval time.Duration) {
NCPU: about.Resources.NCPU,
CPU: about.Resources.CPU,
CPULimit: about.Resources.CPULimit,
CPUCore: about.Resources.CPUCore,
Mem: about.Resources.Mem,
MemLimit: about.Resources.MemLimit,
MemTotal: about.Resources.MemTotal,
MemCore: about.Resources.MemCore,
Error: nil,
},
}

3
http/api/cluster.go
View File

@@ -43,8 +43,11 @@ type ClusterNodeResources struct {
NCPU float64 `json:"ncpu"`
CPU float64 `json:"cpu_used"` // percent 0-100*npcu
CPULimit float64 `json:"cpu_limit"` // percent 0-100*npcu
CPUCore float64 `json:"cpu_core"` // percent 0-100*ncpu
Mem uint64 `json:"memory_used_bytes"` // bytes
MemLimit uint64 `json:"memory_limit_bytes"` // bytes
MemTotal uint64 `json:"memory_total_bytes"` // bytes
MemCore uint64 `json:"memory_core_bytes"` // bytes
Error string `json:"error"`
}

3
http/handler/api/cluster.go
View File

@@ -118,8 +118,11 @@ func (h *ClusterHandler) marshalClusterNode(node cluster.ClusterNode) api.Cluste
NCPU: node.Resources.NCPU,
CPU: node.Resources.CPU,
CPULimit: node.Resources.CPULimit,
CPUCore: node.Resources.CPUCore,
Mem: node.Resources.Mem,
MemLimit: node.Resources.MemLimit,
MemTotal: node.Resources.MemTotal,
MemCore: node.Resources.MemCore,
},
}

15
resources/resources.go
View File

@@ -3,6 +3,7 @@ package resources
import (
"context"
"fmt"
"os"
"sync"
"time"
@@ -20,6 +21,7 @@ type MemoryInfo struct {
Available uint64 // bytes
Used uint64 // bytes
Limit uint64 // bytes
Core uint64 // bytes
Throttling bool
Error error
}
@@ -31,6 +33,7 @@ type CPUInfo struct {
Idle float64 // percent 0-100
Other float64 // percent 0-100
Limit float64 // percent 0-100
Core float64 // percent 0-100
Throttling bool
Error error
}
@@ -46,6 +49,8 @@ type resources struct {
isCPULimiting bool
isMemoryLimiting bool
self psutil.Process
cancelObserver context.CancelFunc
lock sync.RWMutex
@@ -137,6 +142,11 @@ func New(config Config) (Resources, error) {
"max_memory": r.maxMemory,
})
r.self, err = psutil.NewProcess(int32(os.Getpid()), false)
if err != nil {
return nil, fmt.Errorf("unable to create process observer for self: %w", err)
}
r.logger.Debug().Log("Created")
r.stopOnce.Do(func() {})
@@ -160,6 +170,7 @@ func (r *resources) Start() {
func (r *resources) Stop() {
r.stopOnce.Do(func() {
r.cancelObserver()
r.self.Stop()
r.startOnce = sync.Once{}
@@ -326,6 +337,8 @@ func (r *resources) Info() Info {
cpustat, cpuerr := r.psutil.CPUPercent()
memstat, memerr := r.psutil.VirtualMemory()
selfcpu, _ := r.self.CPUPercent()
selfmem, _ := r.self.VirtualMemory()
cpuinfo := CPUInfo{
NCPU: r.ncpu,
@@ -334,6 +347,7 @@ func (r *resources) Info() Info {
Idle: cpustat.Idle,
Other: cpustat.Other,
Limit: cpulimit,
Core: selfcpu.System + selfcpu.User + selfcpu.Other,
Throttling: cputhrottling,
Error: cpuerr,
}
@@ -343,6 +357,7 @@ func (r *resources) Info() Info {
Available: memstat.Available,
Used: memstat.Used,
Limit: memlimit,
Core: selfmem,
Throttling: memthrottling,
Error: memerr,
}