Merge pull request #204 from pborzenkov/centos6-meminfo-numa-fix

meminfo_numa: fix crash on CentOS 6 kernel
9 years ago · ca050b599d
parent 3a96e6881b 5a085dcaf5
commit ca050b599d
3 changed files with 6 additions and 1 deletions
--- a/collector/fixtures/sys/devices/system/node/node0/meminfo
+++ b/collector/fixtures/sys/devices/system/node/node0/meminfo
@ -1,3 +1,4 @@
+
 Node 0 MemTotal:       134182340 kB
 Node 0 MemFree:        53030372 kB
 Node 0 MemUsed:        81151968 kB
--- a/collector/fixtures/sys/devices/system/node/node1/meminfo
+++ b/collector/fixtures/sys/devices/system/node/node1/meminfo
@ -1,3 +1,4 @@
+
 Node 1 MemTotal:       134217728 kB
 Node 1 MemFree:        39634788 kB
 Node 1 MemUsed:        94582940 kB
--- a/collector/meminfo_numa_linux.go
+++ b/collector/meminfo_numa_linux.go
@ -106,7 +106,10 @@ func parseMemInfoNuma(r io.Reader) (map[meminfoKey]float64, error) {
 	)

 	for scanner.Scan() {
-		line := scanner.Text()
+		line := strings.TrimSpace(scanner.Text())
+		if line == "" {
+			continue
+		}
 		parts := strings.Fields(string(line))

 		fv, err := strconv.ParseFloat(parts[3], 64)