Handle process termination during read from /proc (#2816)

Fixes #2815.
(cherry picked from commit c53d9fa9b7)
This commit is contained in:
Daniel Nelson 2017-05-18 18:03:54 -07:00
parent 44654e011c
commit 99edca80ef
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
2 changed files with 9 additions and 0 deletions

View File

@ -4,6 +4,7 @@
- [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
- [#2782](https://github.com/influxdata/telegraf/pull/2782): Reuse transports in input plugins
- [#2815](https://github.com/influxdata/telegraf/issues/2815): Inputs processes fails with "no such process".
## v1.3 [2017-05-15]

View File

@ -12,6 +12,7 @@ import (
"path/filepath"
"runtime"
"strconv"
"syscall"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"
@ -195,6 +196,13 @@ func readProcFile(filename string) ([]byte, error) {
if os.IsNotExist(err) {
return nil, nil
}
// Reading from /proc/<PID> fails with ESRCH if the process has
// been terminated between open() and read().
if perr, ok := err.(*os.PathError); ok && perr.Err == syscall.ESRCH {
return nil, nil
}
return nil, err
}