diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-02-16 06:47:51 -0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2018-02-16 09:47:51 -0500 |
| commit | 6d8f122a5160f6d9e4c51579f2429dfaa62c7271 (patch) | |
| tree | 6e0242cd6709260abd74060a7ec7dc1381efa36e /vendor/github.com/prometheus/procfs/nfs/parse.go | |
| parent | b112747de76f9c11c4d8083207049fac6e435019 (diff) | |
| download | chat-6d8f122a5160f6d9e4c51579f2429dfaa62c7271.tar.gz chat-6d8f122a5160f6d9e4c51579f2429dfaa62c7271.tar.bz2 chat-6d8f122a5160f6d9e4c51579f2429dfaa62c7271.zip | |
Upgrading server dependancies (#8308)
Diffstat (limited to 'vendor/github.com/prometheus/procfs/nfs/parse.go')
| -rw-r--r-- | vendor/github.com/prometheus/procfs/nfs/parse.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vendor/github.com/prometheus/procfs/nfs/parse.go b/vendor/github.com/prometheus/procfs/nfs/parse.go index 3aa32563a..8f568f011 100644 --- a/vendor/github.com/prometheus/procfs/nfs/parse.go +++ b/vendor/github.com/prometheus/procfs/nfs/parse.go @@ -178,8 +178,17 @@ func parseV3Stats(v []uint64) (V3Stats, error) { func parseClientV4Stats(v []uint64) (ClientV4Stats, error) { values := int(v[0]) - if len(v[1:]) != values || values < 59 { - return ClientV4Stats{}, fmt.Errorf("invalid V4Stats line %q", v) + if len(v[1:]) != values { + return ClientV4Stats{}, fmt.Errorf("invalid ClientV4Stats line %q", v) + } + + // This function currently supports mapping 59 NFS v4 client stats. Older + // kernels may emit fewer stats, so we must detect this and pad out the + // values to match the expected slice size. + if values < 59 { + newValues := make([]uint64, 60) + copy(newValues, v) + v = newValues } return ClientV4Stats{ |