luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1246 from hashicorp/fix-node-cpu-usage

Browse source 
Changed the logic of calculation of node cpu usage
This commit is contained in:
Diptanu Choudhury 2016-06-09 19:29:12 -07:00 committed by GitHub
parent 527afa5119 ef2d630ea4
commit 872957e015
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
command/node_status.go
View file

@ -406,11 +406,16 @@ func getActualResources(hostStats *api.HostStats, node *api.Node) ([]string, err
var resources []string var resources []string
// Calculate cpu usage // Calculate cpu usage
usedCPUPercent := 0.0 usedCPUTicks := 0.0
for _, cpu := range hostStats.CPU { if freq, ok := node.Attributes["cpu.frequency"]; ok {
usedCPUPercent += (cpu.User + cpu.System)
if clkSpeed, err := strconv.ParseFloat(freq, 64); err == nil {
for _, cpu := range hostStats.CPU {
usedCPUPercent := (cpu.User + cpu.System)
usedCPUTicks += (clkSpeed * usedCPUPercent / 100)
}
}
} }
usedCPUTicks := (usedCPUPercent / 100) * float64(node.Resources.CPU)
// calculate disk usage // calculate disk usage
storageDevice := node.Attributes["unique.storage.volume"] storageDevice := node.Attributes["unique.storage.volume"]