X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=dd633d5f2287352969f1619f553c105eccd7eade;hb=7bab45b57d6ef99ae55c499c51478dd63c3b1397;hp=b784ee3a3fc1374a66e03f12b432c625ae48dce1;hpb=5e6230c1597ba02a4fb815d2bd553e64028675f5;p=collectd.git

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index b784ee3a..dd633d5f 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -251,7 +251,17 @@ static int za_read (void)
 
 	/* Sizes */
 	za_read_gauge (ksp, "size",    "cache_size", "arc");
-	za_read_gauge (ksp, "l2_size", "cache_size", "L2");
+	za_read_gauge (ksp, "c",    "cache_size", "c");
+	za_read_gauge (ksp, "c_min",    "cache_size", "c_min");
+	za_read_gauge (ksp, "c_max",    "cache_size", "c_max");
+
+	/* The "l2_size" value has disappeared from Solaris some time in
+	 * early 2013, and has only reappeared recently in Solaris 11.2.
+	 * Stop trying if we ever fail to read it, so we don't spam the log.
+	 */
+	static int l2_size_avail = 1;
+	if (l2_size_avail && za_read_gauge (ksp, "l2_size", "cache_size", "L2") != 0)
+		l2_size_avail = 0;
 
 	/* Operations */
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");