diff --git a/plugins/inputs/interrupts/interrupts.go b/plugins/inputs/interrupts/interrupts.go index 75cbf3be1..30b7ee182 100644 --- a/plugins/inputs/interrupts/interrupts.go +++ b/plugins/inputs/interrupts/interrupts.go @@ -3,12 +3,13 @@ package interrupts import ( "bufio" "fmt" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "io" "os" "strconv" "strings" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/inputs" ) type Interrupts struct{} @@ -50,6 +51,8 @@ func parseInterrupts(r io.Reader) ([]IRQ, error) { } cpucount = len(cpus) } + +scan: for scanner.Scan() { fields := strings.Fields(scanner.Text()) if !strings.HasSuffix(fields[0], ":") { @@ -62,7 +65,7 @@ func parseInterrupts(r io.Reader) ([]IRQ, error) { if i < len(irqvals) { irqval, err := strconv.ParseInt(irqvals[i], 10, 64) if err != nil { - return irqs, fmt.Errorf("Unable to parse %q from %q: %s", irqvals[i], scanner.Text(), err) + continue scan } irq.Cpus = append(irq.Cpus, irqval) } diff --git a/plugins/inputs/interrupts/interrupts_test.go b/plugins/inputs/interrupts/interrupts_test.go index 6c76c8504..cf1dc949e 100644 --- a/plugins/inputs/interrupts/interrupts_test.go +++ b/plugins/inputs/interrupts/interrupts_test.go @@ -2,9 +2,10 @@ package interrupts import ( "bytes" + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "testing" ) func TestParseInterrupts(t *testing.T) { @@ -58,3 +59,132 @@ TASKLET: 205 0` } } } + +// Tests #4470 +func TestParseInterruptsBad(t *testing.T) { + interruptStr := ` CPU0 CPU1 CPU2 CPU3 + 16: 0 0 0 0 bcm2836-timer 0 Edge arch_timer + 17: 127224250 118424219 127224437 117885416 bcm2836-timer 1 Edge arch_timer + 21: 0 0 0 0 bcm2836-pmu 9 Edge arm-pmu + 23: 1549514 0 0 0 ARMCTRL-level 1 Edge 3f00b880.mailbox + 24: 2 0 0 0 ARMCTRL-level 2 Edge VCHIQ doorbell + 46: 0 0 0 0 ARMCTRL-level 48 Edge bcm2708_fb dma + 48: 0 0 0 0 ARMCTRL-level 50 Edge DMA IRQ + 50: 0 0 0 0 ARMCTRL-level 52 Edge DMA IRQ + 51: 208 0 0 0 ARMCTRL-level 53 Edge DMA IRQ + 54: 883002 0 0 0 ARMCTRL-level 56 Edge DMA IRQ + 59: 0 0 0 0 ARMCTRL-level 61 Edge bcm2835-auxirq + 62: 521451447 0 0 0 ARMCTRL-level 64 Edge dwc_otg, dwc_otg_pcd, dwc_otg_hcd:usb1 + 86: 857597 0 0 0 ARMCTRL-level 88 Edge mmc0 + 87: 4938 0 0 0 ARMCTRL-level 89 Edge uart-pl011 + 92: 5669 0 0 0 ARMCTRL-level 94 Edge mmc1 + FIQ: usb_fiq + IPI0: 0 0 0 0 CPU wakeup interrupts + IPI1: 0 0 0 0 Timer broadcast interrupts + IPI2: 23564958 23464876 23531165 23040826 Rescheduling interrupts + IPI3: 148438 639704 644266 588150 Function call interrupts + IPI4: 0 0 0 0 CPU stop interrupts + IPI5: 4348149 1843985 3819457 1822877 IRQ work interrupts + IPI6: 0 0 0 0 completion interrupts` + f := bytes.NewBufferString(interruptStr) + parsed := []IRQ{ + IRQ{ + ID: "16", Type: "bcm2836-timer", Device: "0 Edge arch_timer", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "17", Type: "bcm2836-timer", Device: "1 Edge arch_timer", + Cpus: []int64{127224250, 118424219, 127224437, 117885416}, Total: 490758322, + }, + IRQ{ + ID: "21", Type: "bcm2836-pmu", Device: "9 Edge arm-pmu", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "23", Type: "ARMCTRL-level", Device: "1 Edge 3f00b880.mailbox", + Cpus: []int64{1549514, 0, 0, 0}, Total: 1549514, + }, + IRQ{ + ID: "24", Type: "ARMCTRL-level", Device: "2 Edge VCHIQ doorbell", + Cpus: []int64{2, 0, 0, 0}, Total: 2, + }, + IRQ{ + ID: "46", Type: "ARMCTRL-level", Device: "48 Edge bcm2708_fb dma", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "48", Type: "ARMCTRL-level", Device: "50 Edge DMA IRQ", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "50", Type: "ARMCTRL-level", Device: "52 Edge DMA IRQ", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "51", Type: "ARMCTRL-level", Device: "53 Edge DMA IRQ", + Cpus: []int64{208, 0, 0, 0}, Total: 208, + }, + IRQ{ + ID: "54", Type: "ARMCTRL-level", Device: "56 Edge DMA IRQ", + Cpus: []int64{883002, 0, 0, 0}, Total: 883002, + }, + IRQ{ + ID: "59", Type: "ARMCTRL-level", Device: "61 Edge bcm2835-auxirq", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "62", Type: "ARMCTRL-level", Device: "64 Edge dwc_otg, dwc_otg_pcd, dwc_otg_hcd:usb1", + Cpus: []int64{521451447, 0, 0, 0}, Total: 521451447, + }, + IRQ{ + ID: "86", Type: "ARMCTRL-level", Device: "88 Edge mmc0", + Cpus: []int64{857597, 0, 0, 0}, Total: 857597, + }, + IRQ{ + ID: "87", Type: "ARMCTRL-level", Device: "89 Edge uart-pl011", + Cpus: []int64{4938, 0, 0, 0}, Total: 4938, + }, + IRQ{ + ID: "92", Type: "ARMCTRL-level", Device: "94 Edge mmc1", + Cpus: []int64{5669, 0, 0, 0}, Total: 5669, + }, + IRQ{ + ID: "IPI0", Type: "CPU wakeup interrupts", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "IPI1", Type: "Timer broadcast interrupts", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "IPI2", Type: "Rescheduling interrupts", + Cpus: []int64{23564958, 23464876, 23531165, 23040826}, Total: 93601825, + }, + IRQ{ + ID: "IPI3", Type: "Function call interrupts", + Cpus: []int64{148438, 639704, 644266, 588150}, Total: 2020558, + }, + IRQ{ + ID: "IPI4", Type: "CPU stop interrupts", + Cpus: []int64{0, 0, 0, 0}, + }, + IRQ{ + ID: "IPI5", Type: "IRQ work interrupts", + Cpus: []int64{4348149, 1843985, 3819457, 1822877}, Total: 11834468, + }, + IRQ{ + ID: "IPI6", Type: "completion interrupts", + Cpus: []int64{0, 0, 0, 0}, + }, + } + got, err := parseInterrupts(f) + require.Equal(t, nil, err) + require.NotEqual(t, 0, len(got)) + require.Equal(t, len(got), len(parsed)) + for i := 0; i < len(parsed); i++ { + assert.Equal(t, parsed[i], got[i]) + for k := 0; k < len(parsed[i].Cpus); k++ { + assert.Equal(t, parsed[i].Cpus[k], got[i].Cpus[k]) + } + } +}