Skip bad entries on interrupt input #4497
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danielnelson
suggested changes
Jul 31, 2018
| @@ -62,7 +65,8 @@ 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) | |||
| log.Printf("I! skipping interrupt field '%s': %s", irqvals[i], err.Error()) | |||
There was a problem hiding this comment.
This would be hit every interval with the example /proc/interrupts, so we don't want to log. However, we don't want to mask all errors either. I suggest checking if the line has at least cpucount fields before this loop and if not skip the line.
It makes sense to keep this code here still though, only the case of not enough columns should be skipped.
danielnelson
reviewed
Aug 1, 2018
| for scanner.Scan() { | ||
| fields := strings.Fields(scanner.Text()) | ||
| if !strings.HasSuffix(fields[0], ":") { | ||
| continue | ||
| } | ||
| if cpucount > len(fields) { |
There was a problem hiding this comment.
I was going to say we need to compare this against irqvals since fields includes the name of the irq, but then I noticed this line from the existing tests:
MIS: 0
So it is possible to have fewer fields than cpucount. Maybe we just continue with no error if the ParseInt call fails?
danielnelson
approved these changes
Aug 1, 2018
glinton
added a commit
that referenced
this pull request
Aug 1, 2018
(cherry picked from commit 4fff507)
otherpirate
pushed a commit
to otherpirate/telegraf
that referenced
this pull request
Mar 15, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #4470