From: Florian Forster <ff@octo.it>
Date: Fri, 26 Oct 2018 06:21:45 +0000 (+0200)
Subject: Merge pull request #2975 from octo/issue/2954
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=4c0848b1fb7cd097eeec947892d7bad5fd178ad7;hp=4935fa273d77d448bdf8f0646d7be3f179819fbd

Merge pull request #2975 from octo/issue/2954

zfs_arc: Ignore the first two lines of the statistics file on Linux (5.7 cherry-pick)
---

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index af5130aa..063c4019 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -212,6 +212,23 @@ static int za_read(void) {
     return (-1);
   }
 
+  // Ignore the first two lines because they contain information about
+  // the rest of the file.
+  // See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel
+  // module.
+  if (fgets(buffer, sizeof(buffer), fh) == NULL) {
+    ERROR("zfs_arc plugin: \"%s\" does not contain a single line.",
+          ZOL_ARCSTATS_FILE);
+    fclose(fh);
+    return (-1);
+  }
+  if (fgets(buffer, sizeof(buffer), fh) == NULL) {
+    ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.",
+          ZOL_ARCSTATS_FILE);
+    fclose(fh);
+    return (-1);
+  }
+
   while (fgets(buffer, sizeof(buffer), fh) != NULL) {
     char *fields[3];
     value_t v;