svn commit: r338416 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Mark Johnston]

Author: markj
Date: Fri Aug 31 21:45:05 2018
New Revision: 338416
URL: https://svnweb.freebsd.org/changeset/base/338416

Log:
  Re-compute the ARC size before computing the MFU target.
  
  This fixes an upstream regression introduced in r331404, causing overly
  aggressive reclamation of the ARC when under pressure.
  
  Diagnosed by:	Paul <devgs at ukr.net>
  Approved by:	re (gjb)
  MFC after:	3 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Aug 31 18:26:37 2018	(r338415)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Aug 31 21:45:05 2018	(r338416)
@@ -4447,6 +4447,12 @@ arc_adjust(void)
 	}
 
 	/*
+	 * Re-sum ARC stats after the first round of evictions.
+	 */
+	asize = aggsum_value(&arc_size);
+	ameta = aggsum_value(&arc_meta_used);
+
+	/*
 	 * Adjust MFU size
 	 *
 	 * Now that we've tried to evict enough from the MRU to get its