prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2434 from katarzyna-z/kk-fix-type-nvm-info

Browse Source 
Fix typos related to NVMinfo struct and GetMachineMemoryByType function
This commit is contained in:
David Ashpole 2020-03-20 09:28:25 -07:00 committed by GitHub
commit fdeff475ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
info/v1/machine.go
View File

@ -223,10 +223,10 @@ type MemoryInfo struct {
type NVMInfo struct {
// The total NVM capacity in bytes for memory mode.
MemoryModeCapcity uint64 `json:"memory_mode_capcity"`
MemoryModeCapacity uint64 `json:"memory_mode_capacity"`
//The total NVM capacity in bytes for app direct mode.
AppDirectModeCapcity uint64 `json:"app direct_mode_capcity"`
AppDirectModeCapacity uint64 `json:"app direct_mode_capacity"`
// Average power budget in watts for NVM devices configured in BIOS.
AvgPowerBudget uint `json:"avg_power_budget"`

2
machine/machine.go
View File

@ -139,7 +139,7 @@ func GetMachineMemoryCapacity() (uint64, error) {
return memoryCapacity, err
}
// GetMachineMemoryByType returns information about memory capcity and number of DIMMs.
// GetMachineMemoryByType returns information about memory capacity and number of DIMMs.
// Information is retrieved from sysfs edac per-DIMM API (/sys/devices/system/edac/mc/)
// introduced in kernel 3.6. Documentation can be found at
// https://www.kernel.org/doc/Documentation/admin-guide/ras.rst.

2
machine/machine_libipmctl.go
View File

@ -85,7 +85,7 @@ func GetNVMInfo() (info.NVMInfo, error) {
defer C.nvm_uninit()
var err error
nvmInfo.MemoryModeCapcity, nvmInfo.AppDirectModeCapcity, err = getNVMCapacities()
nvmInfo.MemoryModeCapacity, nvmInfo.AppDirectModeCapacity, err = getNVMCapacities()
if err != nil {
return info.NVMInfo{}, fmt.Errorf("Unable to get NVM capacities, err: %s", err)
}