From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 19 May 2015 20:44:15 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.5.0~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51612a1b2f96f6e360f874f6da0b20eac94f48b3;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3' into collectd-5.4
---

51612a1b2f96f6e360f874f6da0b20eac94f48b3
diff --cc src/zfs_arc.c
index 96ffc5495,311a71812..3a54ad8d5
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@@ -158,9 -120,16 +158,16 @@@ static int za_read (void
  
  	/* Sizes */
  	za_read_gauge (ksp, "size",    "cache_size", "arc");
- 	za_read_gauge (ksp, "l2_size", "cache_size", "L2");
+ 
+ 	/* 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 */
 +	/* Operations */
  	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
  #if __FreeBSD__
  	za_read_derive (ksp, "allocated","cache_operation", "allocated");