Merge branch 'develop' into mongodb-3.4

12 files changed, 261 insertions, 259 deletions

diff --git a/dist/api_data.py b/dist/api_data.py
index a092f55761e..0f4506f608c 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -402,6 +402,11 @@ connection_runtime_config = [
                 vary depending on the current eviction load''',
                 min=1, max=20),
             ]),
+    Config('eviction_checkpoint_target', '5', r'''
+        perform eviction at the beginning of checkpoints to bring the dirty
+        content in cache to this level, expressed as a percentage of the total
+        cache size.  Ignored if set to zero or \c in_memory is \c true''',
+        min=0, max=99),
     Config('eviction_dirty_target', '5', r'''
         perform eviction in worker threads when the cache contains at least
         this much dirty content, expressed as a percentage of the total cache
diff --git a/dist/stat_data.py b/dist/stat_data.py
index f701af57408..a050849ad76 100644
--- a/dist/stat_data.py
+++ b/dist/stat_data.py
@@ -203,7 +203,6 @@ connection_stats = [
     CacheStat('cache_eviction_queue_not_empty', 'eviction server candidate queue not empty when topping up'),
     CacheStat('cache_eviction_server_evicting', 'eviction server evicting pages'),
     CacheStat('cache_eviction_server_slept', 'eviction server slept, because we did not make progress with eviction'),
-    CacheStat('cache_eviction_server_toobig', 'eviction server skipped very large page'),
     CacheStat('cache_eviction_slow', 'eviction server unable to reach eviction goal'),
     CacheStat('cache_eviction_split_internal', 'internal pages split during eviction'),
     CacheStat('cache_eviction_split_leaf', 'leaf pages split during eviction'),
diff --git a/src/config/config_def.c b/src/config/config_def.c
index 1aff2b47cc5..0ff2fd379d2 100644
--- a/src/config/config_def.c
+++ b/src/config/config_def.c
@@ -113,6 +113,9 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure[] = {
 	{ "eviction", "category",
 	    NULL, NULL,
 	    confchk_wiredtiger_open_eviction_subconfigs, 2 },
+	{ "eviction_checkpoint_target", "int",
+	    NULL, "min=0,max=99",
+	    NULL, 0 },
 	{ "eviction_dirty_target", "int",
 	    NULL, "min=1,max=99",
 	    NULL, 0 },
@@ -657,6 +660,9 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open[] = {
 	{ "eviction", "category",
 	    NULL, NULL,
 	    confchk_wiredtiger_open_eviction_subconfigs, 2 },
+	{ "eviction_checkpoint_target", "int",
+	    NULL, "min=0,max=99",
+	    NULL, 0 },
 	{ "eviction_dirty_target", "int",
 	    NULL, "min=1,max=99",
 	    NULL, 0 },
@@ -738,6 +744,9 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_all[] = {
 	{ "eviction", "category",
 	    NULL, NULL,
 	    confchk_wiredtiger_open_eviction_subconfigs, 2 },
+	{ "eviction_checkpoint_target", "int",
+	    NULL, "min=0,max=99",
+	    NULL, 0 },
 	{ "eviction_dirty_target", "int",
 	    NULL, "min=1,max=99",
 	    NULL, 0 },
@@ -818,6 +827,9 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_basecfg[] = {
 	{ "eviction", "category",
 	    NULL, NULL,
 	    confchk_wiredtiger_open_eviction_subconfigs, 2 },
+	{ "eviction_checkpoint_target", "int",
+	    NULL, "min=0,max=99",
+	    NULL, 0 },
 	{ "eviction_dirty_target", "int",
 	    NULL, "min=1,max=99",
 	    NULL, 0 },
@@ -894,6 +906,9 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = {
 	{ "eviction", "category",
 	    NULL, NULL,
 	    confchk_wiredtiger_open_eviction_subconfigs, 2 },
+	{ "eviction_checkpoint_target", "int",
+	    NULL, "min=0,max=99",
+	    NULL, 0 },
 	{ "eviction_dirty_target", "int",
 	    NULL, "min=1,max=99",
 	    NULL, 0 },
@@ -989,7 +1004,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	{ "WT_CONNECTION.reconfigure",
 	  "async=(enabled=false,ops_max=1024,threads=2),cache_overhead=8,"
 	  "cache_size=100MB,checkpoint=(log_size=0,wait=0),error_prefix=,"
-	  "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=5,"
+	  "eviction=(threads_max=1,threads_min=1),"
+	  "eviction_checkpoint_target=5,eviction_dirty_target=5,"
 	  "eviction_dirty_trigger=20,eviction_target=80,eviction_trigger=95"
 	  ",file_manager=(close_handle_minimum=250,close_idle_time=30,"
 	  "close_scan_interval=10),log=(archive=true,prealloc=true,"
@@ -998,7 +1014,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  "size=500MB),statistics=none,statistics_log=(json=false,"
 	  "on_close=false,sources=,timestamp=\"%b %d %H:%M:%S\",wait=0),"
 	  "verbose=",
-	  confchk_WT_CONNECTION_reconfigure, 18
+	  confchk_WT_CONNECTION_reconfigure, 19
 	},
 	{ "WT_CONNECTION.set_file_system",
 	  "",
@@ -1190,7 +1206,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,"
 	  "wait=0),checkpoint_sync=true,config_base=true,create=false,"
 	  "direct_io=,encryption=(keyid=,name=,secretkey=),error_prefix=,"
-	  "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=5,"
+	  "eviction=(threads_max=1,threads_min=1),"
+	  "eviction_checkpoint_target=5,eviction_dirty_target=5,"
 	  "eviction_dirty_trigger=20,eviction_target=80,eviction_trigger=95"
 	  ",exclusive=false,extensions=,file_extend=,"
 	  "file_manager=(close_handle_minimum=250,close_idle_time=30,"
@@ -1205,14 +1222,15 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",wait=0),transaction_sync=(enabled=false,method=fsync),"
 	  "use_environment=true,use_environment_priv=false,verbose=,"
 	  "write_through=",
-	  confchk_wiredtiger_open, 38
+	  confchk_wiredtiger_open, 39
 	},
 	{ "wiredtiger_open_all",
 	  "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
 	  ",cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,"
 	  "wait=0),checkpoint_sync=true,config_base=true,create=false,"
 	  "direct_io=,encryption=(keyid=,name=,secretkey=),error_prefix=,"
-	  "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=5,"
+	  "eviction=(threads_max=1,threads_min=1),"
+	  "eviction_checkpoint_target=5,eviction_dirty_target=5,"
 	  "eviction_dirty_trigger=20,eviction_target=80,eviction_trigger=95"
 	  ",exclusive=false,extensions=,file_extend=,"
 	  "file_manager=(close_handle_minimum=250,close_idle_time=30,"
@@ -1227,16 +1245,17 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",wait=0),transaction_sync=(enabled=false,method=fsync),"
 	  "use_environment=true,use_environment_priv=false,verbose=,"
 	  "version=(major=0,minor=0),write_through=",
-	  confchk_wiredtiger_open_all, 39
+	  confchk_wiredtiger_open_all, 40
 	},
 	{ "wiredtiger_open_basecfg",
 	  "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
 	  ",cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,"
 	  "wait=0),checkpoint_sync=true,direct_io=,encryption=(keyid=,name="
 	  ",secretkey=),error_prefix=,eviction=(threads_max=1,"
-	  "threads_min=1),eviction_dirty_target=5,eviction_dirty_trigger=20"
-	  ",eviction_target=80,eviction_trigger=95,extensions=,file_extend="
-	  ",file_manager=(close_handle_minimum=250,close_idle_time=30,"
+	  "threads_min=1),eviction_checkpoint_target=5,"
+	  "eviction_dirty_target=5,eviction_dirty_trigger=20,"
+	  "eviction_target=80,eviction_trigger=95,extensions=,file_extend=,"
+	  "file_manager=(close_handle_minimum=250,close_idle_time=30,"
 	  "close_scan_interval=10),hazard_max=1000,log=(archive=true,"
 	  "compressor=,enabled=false,file_max=100MB,path=\".\","
 	  "prealloc=true,recover=on,zero_fill=false),"
@@ -1247,16 +1266,17 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",on_close=false,path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\""
 	  ",wait=0),transaction_sync=(enabled=false,method=fsync),verbose=,"
 	  "version=(major=0,minor=0),write_through=",
-	  confchk_wiredtiger_open_basecfg, 33
+	  confchk_wiredtiger_open_basecfg, 34
 	},
 	{ "wiredtiger_open_usercfg",
 	  "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
 	  ",cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,"
 	  "wait=0),checkpoint_sync=true,direct_io=,encryption=(keyid=,name="
 	  ",secretkey=),error_prefix=,eviction=(threads_max=1,"
-	  "threads_min=1),eviction_dirty_target=5,eviction_dirty_trigger=20"
-	  ",eviction_target=80,eviction_trigger=95,extensions=,file_extend="
-	  ",file_manager=(close_handle_minimum=250,close_idle_time=30,"
+	  "threads_min=1),eviction_checkpoint_target=5,"
+	  "eviction_dirty_target=5,eviction_dirty_trigger=20,"
+	  "eviction_target=80,eviction_trigger=95,extensions=,file_extend=,"
+	  "file_manager=(close_handle_minimum=250,close_idle_time=30,"
 	  "close_scan_interval=10),hazard_max=1000,log=(archive=true,"
 	  "compressor=,enabled=false,file_max=100MB,path=\".\","
 	  "prealloc=true,recover=on,zero_fill=false),"
@@ -1267,7 +1287,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",on_close=false,path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\""
 	  ",wait=0),transaction_sync=(enabled=false,method=fsync),verbose=,"
 	  "write_through=",
-	  confchk_wiredtiger_open_usercfg, 32
+	  confchk_wiredtiger_open_usercfg, 33
 	},
 	{ NULL, NULL, NULL, 0 }
 };
diff --git a/src/conn/conn_cache.c b/src/conn/conn_cache.c
index 6a8d3430aa1..7e94e9e87dc 100644
--- a/src/conn/conn_cache.c
+++ b/src/conn/conn_cache.c
@@ -43,13 +43,28 @@ __cache_config_local(WT_SESSION_IMPL *session, bool shared, const char *cfg[])
 	cache->eviction_trigger = (u_int)cval.val;
 
 	if (F_ISSET(conn, WT_CONN_IN_MEMORY))
-		cache->eviction_dirty_target =
+		cache->eviction_checkpoint_target =
+		    cache->eviction_dirty_target =
 		    cache->eviction_dirty_trigger = 100U;
 	else {
 		WT_RET(__wt_config_gets(
+		    session, cfg, "eviction_checkpoint_target", &cval));
+		cache->eviction_checkpoint_target = (u_int)cval.val;
+
+		WT_RET(__wt_config_gets(
 		    session, cfg, "eviction_dirty_target", &cval));
 		cache->eviction_dirty_target = (u_int)cval.val;
 
+		/*
+		 * Sanity check the checkpoint target: don't allow a value
+		 * lower than the dirty target.
+		 */
+		if (cache->eviction_checkpoint_target > 0 &&
+		    cache->eviction_checkpoint_target <
+		    cache->eviction_dirty_target)
+			cache->eviction_checkpoint_target =
+			    cache->eviction_dirty_target;
+
 		WT_RET(__wt_config_gets(
 		    session, cfg, "eviction_dirty_trigger", &cval));
 		cache->eviction_dirty_trigger = (u_int)cval.val;
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
index 9d3d2239bb4..3a448818230 100644
--- a/src/docs/upgrading.dox
+++ b/src/docs/upgrading.dox
@@ -12,8 +12,9 @@ the volume of dirty data in cache under 20%.  For write-heavy workloads, the
 new defaults may result in lower throughput and more threads writing to data
 files concurrently.
 
-These settings also now determine how much work is done at the beginning of a
-checkpoint to make the critical section of checkpoints complete more quickly.
+There is also a new \c eviction_checkpoint_target setting that determines
+how much work is done at the beginning of a checkpoint to make the critical
+section of checkpoints complete more quickly.
 </dd>
 
 <dt>Checkpoint server created checkpoint names</dt>
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c
index e7ba9686609..69fff96fef5 100644
--- a/src/evict/evict_lru.c
+++ b/src/evict/evict_lru.c
@@ -457,7 +457,7 @@ __evict_update_work(WT_SESSION_IMPL *session)
 	dirty_inuse = __wt_cache_dirty_leaf_inuse(cache);
 	if (dirty_inuse > (cache->eviction_dirty_target * bytes_max) / 100)
 		F_SET(cache, WT_CACHE_EVICT_DIRTY);
-	if ((dirty_trigger = cache->eviction_scrub_target) < 1.0)
+	if ((dirty_trigger = cache->eviction_scrub_limit) < 1.0)
 		dirty_trigger = (double)cache->eviction_dirty_trigger;
 	if (dirty_inuse > (uint64_t)(dirty_trigger * bytes_max) / 100)
 		F_SET(cache, WT_CACHE_EVICT_DIRTY_HARD);
@@ -1467,45 +1467,6 @@ fast:		/* If the page can't be evicted, give up. */
 }
 
 /*
- * __evict_check_entry_size --
- *	Check if the size of an entry is too large for this thread to evict.
- *	We use this so that the server thread doesn't get stalled evicting
- *	a very large page.
- */
-static bool
-__evict_check_entry_size(WT_SESSION_IMPL *session, WT_EVICT_ENTRY *entry)
-{
-	WT_CACHE *cache;
-	WT_PAGE *page;
-	WT_REF *ref;
-	uint64_t max;
-
-	cache = S2C(session)->cache;
-
-	if (cache->pages_evict == 0 || cache->bytes_evict < WT_MEGABYTE)
-		return (true);
-
-	max = (cache->bytes_evict / cache->pages_evict) * 4;
-	if ((ref = entry->ref) != NULL) {
-		if ((page = ref->page) == NULL)
-			return (true);
-
-		/*
-		 * If this page is dirty and more than four times the average
-		 * evicted page size then return false.  Return true in all
-		 * other cases.
-		 */
-		if (__wt_page_is_modified(page) &&
-		    page->memory_footprint > max) {
-			WT_STAT_FAST_CONN_INCR(
-			    session, cache_eviction_server_toobig);
-			return (false);
-		}
-	}
-	return (true);
-}
-
-/*
  * __evict_get_ref --
  *	Get a page for eviction.
  */
@@ -1617,26 +1578,17 @@ __evict_get_ref(
 		WT_ASSERT(session, evict->btree != NULL);
 
 		/*
-		 * If the server is helping out and encounters an entry that is
-		 * too large, it stops helping.  Evicting a very large page in
-		 * the server thread could stall eviction from finding new
-		 * work.
+		 * Evicting a dirty page in the server thread could stall
+		 * during a write and prevent eviction from finding new work.
 		 *
 		 * However, we can't skip entries in the urgent queue or they
 		 * may never be found again.
-		 */
-		if (is_server && !urgent_ok &&
-		    !__evict_check_entry_size(session, evict)) {
-			--evict;
-			break;
-		}
-
-		/*
+		 *
 		 * Don't force application threads to evict dirty pages if they
 		 * aren't stalled by the amount of dirty data in cache.
 		 */
-		if (is_app && !urgent_ok &&
-		    !F_ISSET(cache, WT_CACHE_EVICT_DIRTY_HARD) &&
+		if (!urgent_ok && (is_server || (is_app &&
+		    !F_ISSET(cache, WT_CACHE_EVICT_DIRTY_HARD))) &&
 		    __wt_page_is_modified(evict->ref->page)) {
 			--evict;
 			break;
@@ -1808,7 +1760,7 @@ __wt_cache_eviction_worker(WT_SESSION_IMPL *session, bool busy, u_int pct_full)
 		 * checkpoints.  Just throttle updates instead.
 		 */
 		if (busy && WT_EVICT_HAS_WORKERS(session) &&
-		    cache->eviction_scrub_target > 0.0 &&
+		    cache->eviction_scrub_limit > 0.0 &&
 		    !F_ISSET(cache, WT_CACHE_EVICT_CLEAN_HARD)) {
 			__wt_yield();
 			continue;
diff --git a/src/include/cache.h b/src/include/cache.h
index 339a4f19648..0cb61f01435 100644
--- a/src/include/cache.h
+++ b/src/include/cache.h
@@ -98,12 +98,14 @@ struct __wt_cache {
 	WT_CONDVAR *evict_cond;		/* Eviction server condition */
 	WT_SPINLOCK evict_walk_lock;	/* Eviction walk location */
 
-	u_int eviction_trigger;		/* Percent to trigger eviction */
-	u_int eviction_target;		/* Percent to end eviction */
 	u_int eviction_dirty_target;    /* Percent to allow dirty */
 	u_int eviction_dirty_trigger;	/* Percent to trigger dirty eviction */
+	u_int eviction_trigger;		/* Percent to trigger eviction */
+	u_int eviction_target;		/* Percent to end eviction */
 
-	double eviction_scrub_target;	/* Percent of cache to trigger
+	u_int eviction_checkpoint_target;/* Percent to reduce dirty
+					   to during checkpoint scrubs */
+	double eviction_scrub_limit;	/* Percent of cache to trigger
 					   dirty eviction during checkpoint
 					   scrubs */
 
diff --git a/src/include/cache.i b/src/include/cache.i
index 99f952e5a17..b5605769f1a 100644
--- a/src/include/cache.i
+++ b/src/include/cache.i
@@ -268,7 +268,7 @@ __wt_eviction_needed(WT_SESSION_IMPL *session, bool busy, u_int *pct_fullp)
 	 * The next transaction in this session will not be able to start until
 	 * the cache is under the limit.
 	 */
-	if ((dirty_trigger = cache->eviction_scrub_target) < 1.0)
+	if ((dirty_trigger = cache->eviction_scrub_limit) < 1.0)
 		dirty_trigger = (double)cache->eviction_dirty_trigger;
 	return (bytes_inuse > (cache->eviction_trigger * bytes_max) / 100 ||
 	    (!busy &&
diff --git a/src/include/stat.h b/src/include/stat.h
index e0d0a6eb780..b61c568783b 100644
--- a/src/include/stat.h
+++ b/src/include/stat.h
@@ -289,7 +289,6 @@ struct __wt_connection_stats {
 	int64_t cache_eviction_queue_empty;
 	int64_t cache_eviction_queue_not_empty;
 	int64_t cache_eviction_server_evicting;
-	int64_t cache_eviction_server_toobig;
 	int64_t cache_eviction_server_slept;
 	int64_t cache_eviction_slow;
 	int64_t cache_eviction_state;
diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in
index 6563fc2cf1a..d4d52545bfc 100644
--- a/src/include/wiredtiger.in
+++ b/src/include/wiredtiger.in
@@ -1808,6 +1808,11 @@ struct __wt_connection {
 	 * number of threads currently running will vary depending on the
 	 * current eviction load., an integer between 1 and 20; default \c 1.}
 	 * @config{ ),,}
+	 * @config{eviction_checkpoint_target, perform eviction at the beginning
+	 * of checkpoints to bring the dirty content in cache to this level\,
+	 * expressed as a percentage of the total cache size.  Ignored if set to
+	 * zero or \c in_memory is \c true., an integer between 0 and 99;
+	 * default \c 5.}
 	 * @config{eviction_dirty_target, perform eviction in worker threads
 	 * when the cache contains at least this much dirty content\, expressed
 	 * as a percentage of the total cache size.  Ignored if \c in_memory is
@@ -2270,6 +2275,10 @@ struct __wt_connection {
  * current eviction load., an integer between 1 and 20; default \c 1.}
  * @config{
  * ),,}
+ * @config{eviction_checkpoint_target, perform eviction at the beginning of
+ * checkpoints to bring the dirty content in cache to this level\, expressed as
+ * a percentage of the total cache size.  Ignored if set to zero or \c in_memory
+ * is \c true., an integer between 0 and 99; default \c 5.}
  * @config{eviction_dirty_target, perform eviction in worker threads when the
  * cache contains at least this much dirty content\, expressed as a percentage
  * of the total cache size.  Ignored if \c in_memory is \c true., an integer
@@ -4291,356 +4300,354 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection);
 #define	WT_STAT_CONN_CACHE_EVICTION_QUEUE_NOT_EMPTY	1042
 /*! cache: eviction server evicting pages */
 #define	WT_STAT_CONN_CACHE_EVICTION_SERVER_EVICTING	1043
-/*! cache: eviction server skipped very large page */
-#define	WT_STAT_CONN_CACHE_EVICTION_SERVER_TOOBIG	1044
 /*!
  * cache: eviction server slept, because we did not make progress with
  * eviction
  */
-#define	WT_STAT_CONN_CACHE_EVICTION_SERVER_SLEPT	1045
+#define	WT_STAT_CONN_CACHE_EVICTION_SERVER_SLEPT	1044
 /*! cache: eviction server unable to reach eviction goal */
-#define	WT_STAT_CONN_CACHE_EVICTION_SLOW		1046
+#define	WT_STAT_CONN_CACHE_EVICTION_SLOW		1045
 /*! cache: eviction state */
-#define	WT_STAT_CONN_CACHE_EVICTION_STATE		1047
+#define	WT_STAT_CONN_CACHE_EVICTION_STATE		1046
 /*! cache: eviction worker thread evicting pages */
-#define	WT_STAT_CONN_CACHE_EVICTION_WORKER_EVICTING	1048
+#define	WT_STAT_CONN_CACHE_EVICTION_WORKER_EVICTING	1047
 /*! cache: failed eviction of pages that exceeded the in-memory maximum */
-#define	WT_STAT_CONN_CACHE_EVICTION_FORCE_FAIL		1049
+#define	WT_STAT_CONN_CACHE_EVICTION_FORCE_FAIL		1048
 /*! cache: files with active eviction walks */
-#define	WT_STAT_CONN_CACHE_EVICTION_WALKS_ACTIVE	1050
+#define	WT_STAT_CONN_CACHE_EVICTION_WALKS_ACTIVE	1049
 /*! cache: files with new eviction walks started */
-#define	WT_STAT_CONN_CACHE_EVICTION_WALKS_STARTED	1051
+#define	WT_STAT_CONN_CACHE_EVICTION_WALKS_STARTED	1050
 /*! cache: hazard pointer blocked page eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_HAZARD		1052
+#define	WT_STAT_CONN_CACHE_EVICTION_HAZARD		1051
 /*! cache: hazard pointer check calls */
-#define	WT_STAT_CONN_CACHE_HAZARD_CHECKS		1053
+#define	WT_STAT_CONN_CACHE_HAZARD_CHECKS		1052
 /*! cache: hazard pointer check entries walked */
-#define	WT_STAT_CONN_CACHE_HAZARD_WALKS			1054
+#define	WT_STAT_CONN_CACHE_HAZARD_WALKS			1053
 /*! cache: hazard pointer maximum array length */
-#define	WT_STAT_CONN_CACHE_HAZARD_MAX			1055
+#define	WT_STAT_CONN_CACHE_HAZARD_MAX			1054
 /*! cache: in-memory page passed criteria to be split */
-#define	WT_STAT_CONN_CACHE_INMEM_SPLITTABLE		1056
+#define	WT_STAT_CONN_CACHE_INMEM_SPLITTABLE		1055
 /*! cache: in-memory page splits */
-#define	WT_STAT_CONN_CACHE_INMEM_SPLIT			1057
+#define	WT_STAT_CONN_CACHE_INMEM_SPLIT			1056
 /*! cache: internal pages evicted */
-#define	WT_STAT_CONN_CACHE_EVICTION_INTERNAL		1058
+#define	WT_STAT_CONN_CACHE_EVICTION_INTERNAL		1057
 /*! cache: internal pages split during eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_SPLIT_INTERNAL	1059
+#define	WT_STAT_CONN_CACHE_EVICTION_SPLIT_INTERNAL	1058
 /*! cache: leaf pages split during eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_SPLIT_LEAF		1060
+#define	WT_STAT_CONN_CACHE_EVICTION_SPLIT_LEAF		1059
 /*! cache: lookaside table insert calls */
-#define	WT_STAT_CONN_CACHE_LOOKASIDE_INSERT		1061
+#define	WT_STAT_CONN_CACHE_LOOKASIDE_INSERT		1060
 /*! cache: lookaside table remove calls */
-#define	WT_STAT_CONN_CACHE_LOOKASIDE_REMOVE		1062
+#define	WT_STAT_CONN_CACHE_LOOKASIDE_REMOVE		1061
 /*! cache: maximum bytes configured */
-#define	WT_STAT_CONN_CACHE_BYTES_MAX			1063
+#define	WT_STAT_CONN_CACHE_BYTES_MAX			1062
 /*! cache: maximum page size at eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_MAXIMUM_PAGE_SIZE	1064
+#define	WT_STAT_CONN_CACHE_EVICTION_MAXIMUM_PAGE_SIZE	1063
 /*! cache: modified pages evicted */
-#define	WT_STAT_CONN_CACHE_EVICTION_DIRTY		1065
+#define	WT_STAT_CONN_CACHE_EVICTION_DIRTY		1064
 /*! cache: modified pages evicted by application threads */
-#define	WT_STAT_CONN_CACHE_EVICTION_APP_DIRTY		1066
+#define	WT_STAT_CONN_CACHE_EVICTION_APP_DIRTY		1065
 /*! cache: overflow pages read into cache */
-#define	WT_STAT_CONN_CACHE_READ_OVERFLOW		1067
+#define	WT_STAT_CONN_CACHE_READ_OVERFLOW		1066
 /*! cache: overflow values cached in memory */
-#define	WT_STAT_CONN_CACHE_OVERFLOW_VALUE		1068
+#define	WT_STAT_CONN_CACHE_OVERFLOW_VALUE		1067
 /*! cache: page split during eviction deepened the tree */
-#define	WT_STAT_CONN_CACHE_EVICTION_DEEPEN		1069
+#define	WT_STAT_CONN_CACHE_EVICTION_DEEPEN		1068
 /*! cache: page written requiring lookaside records */
-#define	WT_STAT_CONN_CACHE_WRITE_LOOKASIDE		1070
+#define	WT_STAT_CONN_CACHE_WRITE_LOOKASIDE		1069
 /*! cache: pages currently held in the cache */
-#define	WT_STAT_CONN_CACHE_PAGES_INUSE			1071
+#define	WT_STAT_CONN_CACHE_PAGES_INUSE			1070
 /*! cache: pages evicted because they exceeded the in-memory maximum */
-#define	WT_STAT_CONN_CACHE_EVICTION_FORCE		1072
+#define	WT_STAT_CONN_CACHE_EVICTION_FORCE		1071
 /*! cache: pages evicted because they had chains of deleted items */
-#define	WT_STAT_CONN_CACHE_EVICTION_FORCE_DELETE	1073
+#define	WT_STAT_CONN_CACHE_EVICTION_FORCE_DELETE	1072
 /*! cache: pages evicted by application threads */
-#define	WT_STAT_CONN_CACHE_EVICTION_APP			1074
+#define	WT_STAT_CONN_CACHE_EVICTION_APP			1073
 /*! cache: pages queued for eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_QUEUED	1075
+#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_QUEUED	1074
 /*! cache: pages queued for urgent eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_QUEUED_URGENT	1076
+#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_QUEUED_URGENT	1075
 /*! cache: pages queued for urgent eviction during walk */
-#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_QUEUED_OLDEST	1077
+#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_QUEUED_OLDEST	1076
 /*! cache: pages read into cache */
-#define	WT_STAT_CONN_CACHE_READ				1078
+#define	WT_STAT_CONN_CACHE_READ				1077
 /*! cache: pages read into cache requiring lookaside entries */
-#define	WT_STAT_CONN_CACHE_READ_LOOKASIDE		1079
+#define	WT_STAT_CONN_CACHE_READ_LOOKASIDE		1078
 /*! cache: pages requested from the cache */
-#define	WT_STAT_CONN_CACHE_PAGES_REQUESTED		1080
+#define	WT_STAT_CONN_CACHE_PAGES_REQUESTED		1079
 /*! cache: pages seen by eviction walk */
-#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_SEEN		1081
+#define	WT_STAT_CONN_CACHE_EVICTION_PAGES_SEEN		1080
 /*! cache: pages selected for eviction unable to be evicted */
-#define	WT_STAT_CONN_CACHE_EVICTION_FAIL		1082
+#define	WT_STAT_CONN_CACHE_EVICTION_FAIL		1081
 /*! cache: pages walked for eviction */
-#define	WT_STAT_CONN_CACHE_EVICTION_WALK		1083
+#define	WT_STAT_CONN_CACHE_EVICTION_WALK		1082
 /*! cache: pages written from cache */
-#define	WT_STAT_CONN_CACHE_WRITE			1084
+#define	WT_STAT_CONN_CACHE_WRITE			1083
 /*! cache: pages written requiring in-memory restoration */
-#define	WT_STAT_CONN_CACHE_WRITE_RESTORE		1085
+#define	WT_STAT_CONN_CACHE_WRITE_RESTORE		1084
 /*! cache: percentage overhead */
-#define	WT_STAT_CONN_CACHE_OVERHEAD			1086
+#define	WT_STAT_CONN_CACHE_OVERHEAD			1085
 /*! cache: tracked bytes belonging to internal pages in the cache */
-#define	WT_STAT_CONN_CACHE_BYTES_INTERNAL		1087
+#define	WT_STAT_CONN_CACHE_BYTES_INTERNAL		1086
 /*! cache: tracked bytes belonging to leaf pages in the cache */
-#define	WT_STAT_CONN_CACHE_BYTES_LEAF			1088
+#define	WT_STAT_CONN_CACHE_BYTES_LEAF			1087
 /*! cache: tracked dirty bytes in the cache */
-#define	WT_STAT_CONN_CACHE_BYTES_DIRTY			1089
+#define	WT_STAT_CONN_CACHE_BYTES_DIRTY			1088
 /*! cache: tracked dirty pages in the cache */
-#define	WT_STAT_CONN_CACHE_PAGES_DIRTY			1090
+#define	WT_STAT_CONN_CACHE_PAGES_DIRTY			1089
 /*! cache: unmodified pages evicted */
-#define	WT_STAT_CONN_CACHE_EVICTION_CLEAN		1091
+#define	WT_STAT_CONN_CACHE_EVICTION_CLEAN		1090
 /*! connection: auto adjusting condition resets */
-#define	WT_STAT_CONN_COND_AUTO_WAIT_RESET		1092
+#define	WT_STAT_CONN_COND_AUTO_WAIT_RESET		1091
 /*! connection: auto adjusting condition wait calls */
-#define	WT_STAT_CONN_COND_AUTO_WAIT			1093
+#define	WT_STAT_CONN_COND_AUTO_WAIT			1092
 /*! connection: files currently open */
-#define	WT_STAT_CONN_FILE_OPEN				1094
+#define	WT_STAT_CONN_FILE_OPEN				1093
 /*! connection: memory allocations */
-#define	WT_STAT_CONN_MEMORY_ALLOCATION			1095
+#define	WT_STAT_CONN_MEMORY_ALLOCATION			1094
 /*! connection: memory frees */
-#define	WT_STAT_CONN_MEMORY_FREE			1096
+#define	WT_STAT_CONN_MEMORY_FREE			1095
 /*! connection: memory re-allocations */
-#define	WT_STAT_CONN_MEMORY_GROW			1097
+#define	WT_STAT_CONN_MEMORY_GROW			1096
 /*! connection: pthread mutex condition wait calls */
-#define	WT_STAT_CONN_COND_WAIT				1098
+#define	WT_STAT_CONN_COND_WAIT				1097
 /*! connection: pthread mutex shared lock read-lock calls */
-#define	WT_STAT_CONN_RWLOCK_READ			1099
+#define	WT_STAT_CONN_RWLOCK_READ			1098
 /*! connection: pthread mutex shared lock write-lock calls */
-#define	WT_STAT_CONN_RWLOCK_WRITE			1100
+#define	WT_STAT_CONN_RWLOCK_WRITE			1099
 /*! connection: total fsync I/Os */
-#define	WT_STAT_CONN_FSYNC_IO				1101
+#define	WT_STAT_CONN_FSYNC_IO				1100
 /*! connection: total read I/Os */
-#define	WT_STAT_CONN_READ_IO				1102
+#define	WT_STAT_CONN_READ_IO				1101
 /*! connection: total write I/Os */
-#define	WT_STAT_CONN_WRITE_IO				1103
+#define	WT_STAT_CONN_WRITE_IO				1102
 /*! cursor: cursor create calls */
-#define	WT_STAT_CONN_CURSOR_CREATE			1104
+#define	WT_STAT_CONN_CURSOR_CREATE			1103
 /*! cursor: cursor insert calls */
-#define	WT_STAT_CONN_CURSOR_INSERT			1105
+#define	WT_STAT_CONN_CURSOR_INSERT			1104
 /*! cursor: cursor next calls */
-#define	WT_STAT_CONN_CURSOR_NEXT			1106
+#define	WT_STAT_CONN_CURSOR_NEXT			1105
 /*! cursor: cursor prev calls */
-#define	WT_STAT_CONN_CURSOR_PREV			1107
+#define	WT_STAT_CONN_CURSOR_PREV			1106
 /*! cursor: cursor remove calls */
-#define	WT_STAT_CONN_CURSOR_REMOVE			1108
+#define	WT_STAT_CONN_CURSOR_REMOVE			1107
 /*! cursor: cursor reset calls */
-#define	WT_STAT_CONN_CURSOR_RESET			1109
+#define	WT_STAT_CONN_CURSOR_RESET			1108
 /*! cursor: cursor restarted searches */
-#define	WT_STAT_CONN_CURSOR_RESTART			1110
+#define	WT_STAT_CONN_CURSOR_RESTART			1109
 /*! cursor: cursor search calls */
-#define	WT_STAT_CONN_CURSOR_SEARCH			1111
+#define	WT_STAT_CONN_CURSOR_SEARCH			1110
 /*! cursor: cursor search near calls */
-#define	WT_STAT_CONN_CURSOR_SEARCH_NEAR			1112
+#define	WT_STAT_CONN_CURSOR_SEARCH_NEAR			1111
 /*! cursor: cursor update calls */
-#define	WT_STAT_CONN_CURSOR_UPDATE			1113
+#define	WT_STAT_CONN_CURSOR_UPDATE			1112
 /*! cursor: truncate calls */
-#define	WT_STAT_CONN_CURSOR_TRUNCATE			1114
+#define	WT_STAT_CONN_CURSOR_TRUNCATE			1113
 /*! data-handle: connection data handles currently active */
-#define	WT_STAT_CONN_DH_CONN_HANDLE_COUNT		1115
+#define	WT_STAT_CONN_DH_CONN_HANDLE_COUNT		1114
 /*! data-handle: connection sweep candidate became referenced */
-#define	WT_STAT_CONN_DH_SWEEP_REF			1116
+#define	WT_STAT_CONN_DH_SWEEP_REF			1115
 /*! data-handle: connection sweep dhandles closed */
-#define	WT_STAT_CONN_DH_SWEEP_CLOSE			1117
+#define	WT_STAT_CONN_DH_SWEEP_CLOSE			1116
 /*! data-handle: connection sweep dhandles removed from hash list */
-#define	WT_STAT_CONN_DH_SWEEP_REMOVE			1118
+#define	WT_STAT_CONN_DH_SWEEP_REMOVE			1117
 /*! data-handle: connection sweep time-of-death sets */
-#define	WT_STAT_CONN_DH_SWEEP_TOD			1119
+#define	WT_STAT_CONN_DH_SWEEP_TOD			1118
 /*! data-handle: connection sweeps */
-#define	WT_STAT_CONN_DH_SWEEPS				1120
+#define	WT_STAT_CONN_DH_SWEEPS				1119
 /*! data-handle: session dhandles swept */
-#define	WT_STAT_CONN_DH_SESSION_HANDLES			1121
+#define	WT_STAT_CONN_DH_SESSION_HANDLES			1120
 /*! data-handle: session sweep attempts */
-#define	WT_STAT_CONN_DH_SESSION_SWEEPS			1122
+#define	WT_STAT_CONN_DH_SESSION_SWEEPS			1121
 /*! log: busy returns attempting to switch slots */
-#define	WT_STAT_CONN_LOG_SLOT_SWITCH_BUSY		1123
+#define	WT_STAT_CONN_LOG_SLOT_SWITCH_BUSY		1122
 /*! log: consolidated slot closures */
-#define	WT_STAT_CONN_LOG_SLOT_CLOSES			1124
+#define	WT_STAT_CONN_LOG_SLOT_CLOSES			1123
 /*! log: consolidated slot join races */
-#define	WT_STAT_CONN_LOG_SLOT_RACES			1125
+#define	WT_STAT_CONN_LOG_SLOT_RACES			1124
 /*! log: consolidated slot join transitions */
-#define	WT_STAT_CONN_LOG_SLOT_TRANSITIONS		1126
+#define	WT_STAT_CONN_LOG_SLOT_TRANSITIONS		1125
 /*! log: consolidated slot joins */
-#define	WT_STAT_CONN_LOG_SLOT_JOINS			1127
+#define	WT_STAT_CONN_LOG_SLOT_JOINS			1126
 /*! log: consolidated slot unbuffered writes */
-#define	WT_STAT_CONN_LOG_SLOT_UNBUFFERED		1128
+#define	WT_STAT_CONN_LOG_SLOT_UNBUFFERED		1127
 /*! log: log bytes of payload data */
-#define	WT_STAT_CONN_LOG_BYTES_PAYLOAD			1129
+#define	WT_STAT_CONN_LOG_BYTES_PAYLOAD			1128
 /*! log: log bytes written */
-#define	WT_STAT_CONN_LOG_BYTES_WRITTEN			1130
+#define	WT_STAT_CONN_LOG_BYTES_WRITTEN			1129
 /*! log: log files manually zero-filled */
-#define	WT_STAT_CONN_LOG_ZERO_FILLS			1131
+#define	WT_STAT_CONN_LOG_ZERO_FILLS			1130
 /*! log: log flush operations */
-#define	WT_STAT_CONN_LOG_FLUSH				1132
+#define	WT_STAT_CONN_LOG_FLUSH				1131
 /*! log: log force write operations */
-#define	WT_STAT_CONN_LOG_FORCE_WRITE			1133
+#define	WT_STAT_CONN_LOG_FORCE_WRITE			1132
 /*! log: log force write operations skipped */
-#define	WT_STAT_CONN_LOG_FORCE_WRITE_SKIP		1134
+#define	WT_STAT_CONN_LOG_FORCE_WRITE_SKIP		1133
 /*! log: log records compressed */
-#define	WT_STAT_CONN_LOG_COMPRESS_WRITES		1135
+#define	WT_STAT_CONN_LOG_COMPRESS_WRITES		1134
 /*! log: log records not compressed */
-#define	WT_STAT_CONN_LOG_COMPRESS_WRITE_FAILS		1136
+#define	WT_STAT_CONN_LOG_COMPRESS_WRITE_FAILS		1135
 /*! log: log records too small to compress */
-#define	WT_STAT_CONN_LOG_COMPRESS_SMALL			1137
+#define	WT_STAT_CONN_LOG_COMPRESS_SMALL			1136
 /*! log: log release advances write LSN */
-#define	WT_STAT_CONN_LOG_RELEASE_WRITE_LSN		1138
+#define	WT_STAT_CONN_LOG_RELEASE_WRITE_LSN		1137
 /*! log: log scan operations */
-#define	WT_STAT_CONN_LOG_SCANS				1139
+#define	WT_STAT_CONN_LOG_SCANS				1138
 /*! log: log scan records requiring two reads */
-#define	WT_STAT_CONN_LOG_SCAN_REREADS			1140
+#define	WT_STAT_CONN_LOG_SCAN_REREADS			1139
 /*! log: log server thread advances write LSN */
-#define	WT_STAT_CONN_LOG_WRITE_LSN			1141
+#define	WT_STAT_CONN_LOG_WRITE_LSN			1140
 /*! log: log server thread write LSN walk skipped */
-#define	WT_STAT_CONN_LOG_WRITE_LSN_SKIP			1142
+#define	WT_STAT_CONN_LOG_WRITE_LSN_SKIP			1141
 /*! log: log sync operations */
-#define	WT_STAT_CONN_LOG_SYNC				1143
+#define	WT_STAT_CONN_LOG_SYNC				1142
 /*! log: log sync time duration (usecs) */
-#define	WT_STAT_CONN_LOG_SYNC_DURATION			1144
+#define	WT_STAT_CONN_LOG_SYNC_DURATION			1143
 /*! log: log sync_dir operations */
-#define	WT_STAT_CONN_LOG_SYNC_DIR			1145
+#define	WT_STAT_CONN_LOG_SYNC_DIR			1144
 /*! log: log sync_dir time duration (usecs) */
-#define	WT_STAT_CONN_LOG_SYNC_DIR_DURATION		1146
+#define	WT_STAT_CONN_LOG_SYNC_DIR_DURATION		1145
 /*! log: log write operations */
-#define	WT_STAT_CONN_LOG_WRITES				1147
+#define	WT_STAT_CONN_LOG_WRITES				1146
 /*! log: logging bytes consolidated */
-#define	WT_STAT_CONN_LOG_SLOT_CONSOLIDATED		1148
+#define	WT_STAT_CONN_LOG_SLOT_CONSOLIDATED		1147
 /*! log: maximum log file size */
-#define	WT_STAT_CONN_LOG_MAX_FILESIZE			1149
+#define	WT_STAT_CONN_LOG_MAX_FILESIZE			1148
 /*! log: number of pre-allocated log files to create */
-#define	WT_STAT_CONN_LOG_PREALLOC_MAX			1150
+#define	WT_STAT_CONN_LOG_PREALLOC_MAX			1149
 /*! log: pre-allocated log files not ready and missed */
-#define	WT_STAT_CONN_LOG_PREALLOC_MISSED		1151
+#define	WT_STAT_CONN_LOG_PREALLOC_MISSED		1150
 /*! log: pre-allocated log files prepared */
-#define	WT_STAT_CONN_LOG_PREALLOC_FILES			1152
+#define	WT_STAT_CONN_LOG_PREALLOC_FILES			1151
 /*! log: pre-allocated log files used */
-#define	WT_STAT_CONN_LOG_PREALLOC_USED			1153
+#define	WT_STAT_CONN_LOG_PREALLOC_USED			1152
 /*! log: records processed by log scan */
-#define	WT_STAT_CONN_LOG_SCAN_RECORDS			1154
+#define	WT_STAT_CONN_LOG_SCAN_RECORDS			1153
 /*! log: total in-memory size of compressed records */
-#define	WT_STAT_CONN_LOG_COMPRESS_MEM			1155
+#define	WT_STAT_CONN_LOG_COMPRESS_MEM			1154
 /*! log: total log buffer size */
-#define	WT_STAT_CONN_LOG_BUFFER_SIZE			1156
+#define	WT_STAT_CONN_LOG_BUFFER_SIZE			1155
 /*! log: total size of compressed records */
-#define	WT_STAT_CONN_LOG_COMPRESS_LEN			1157
+#define	WT_STAT_CONN_LOG_COMPRESS_LEN			1156
 /*! log: written slots coalesced */
-#define	WT_STAT_CONN_LOG_SLOT_COALESCED			1158
+#define	WT_STAT_CONN_LOG_SLOT_COALESCED			1157
 /*! log: yields waiting for previous log file close */
-#define	WT_STAT_CONN_LOG_CLOSE_YIELDS			1159
+#define	WT_STAT_CONN_LOG_CLOSE_YIELDS			1158
 /*! reconciliation: fast-path pages deleted */
-#define	WT_STAT_CONN_REC_PAGE_DELETE_FAST		1160
+#define	WT_STAT_CONN_REC_PAGE_DELETE_FAST		1159
 /*! reconciliation: page reconciliation calls */
-#define	WT_STAT_CONN_REC_PAGES				1161
+#define	WT_STAT_CONN_REC_PAGES				1160
 /*! reconciliation: page reconciliation calls for eviction */
-#define	WT_STAT_CONN_REC_PAGES_EVICTION			1162
+#define	WT_STAT_CONN_REC_PAGES_EVICTION			1161
 /*! reconciliation: pages deleted */
-#define	WT_STAT_CONN_REC_PAGE_DELETE			1163
+#define	WT_STAT_CONN_REC_PAGE_DELETE			1162
 /*! reconciliation: split bytes currently awaiting free */
-#define	WT_STAT_CONN_REC_SPLIT_STASHED_BYTES		1164
+#define	WT_STAT_CONN_REC_SPLIT_STASHED_BYTES		1163
 /*! reconciliation: split objects currently awaiting free */
-#define	WT_STAT_CONN_REC_SPLIT_STASHED_OBJECTS		1165
+#define	WT_STAT_CONN_REC_SPLIT_STASHED_OBJECTS		1164
 /*! session: open cursor count */
-#define	WT_STAT_CONN_SESSION_CURSOR_OPEN		1166
+#define	WT_STAT_CONN_SESSION_CURSOR_OPEN		1165
 /*! session: open session count */
-#define	WT_STAT_CONN_SESSION_OPEN			1167
+#define	WT_STAT_CONN_SESSION_OPEN			1166
 /*! session: table compact failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_COMPACT_FAIL		1168
+#define	WT_STAT_CONN_SESSION_TABLE_COMPACT_FAIL		1167
 /*! session: table compact successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_COMPACT_SUCCESS	1169
+#define	WT_STAT_CONN_SESSION_TABLE_COMPACT_SUCCESS	1168
 /*! session: table create failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_CREATE_FAIL		1170
+#define	WT_STAT_CONN_SESSION_TABLE_CREATE_FAIL		1169
 /*! session: table create successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_CREATE_SUCCESS	1171
+#define	WT_STAT_CONN_SESSION_TABLE_CREATE_SUCCESS	1170
 /*! session: table drop failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_DROP_FAIL		1172
+#define	WT_STAT_CONN_SESSION_TABLE_DROP_FAIL		1171
 /*! session: table drop successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_DROP_SUCCESS		1173
+#define	WT_STAT_CONN_SESSION_TABLE_DROP_SUCCESS		1172
 /*! session: table rebalance failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_REBALANCE_FAIL	1174
+#define	WT_STAT_CONN_SESSION_TABLE_REBALANCE_FAIL	1173
 /*! session: table rebalance successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_REBALANCE_SUCCESS	1175
+#define	WT_STAT_CONN_SESSION_TABLE_REBALANCE_SUCCESS	1174
 /*! session: table rename failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_RENAME_FAIL		1176
+#define	WT_STAT_CONN_SESSION_TABLE_RENAME_FAIL		1175
 /*! session: table rename successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_RENAME_SUCCESS	1177
+#define	WT_STAT_CONN_SESSION_TABLE_RENAME_SUCCESS	1176
 /*! session: table salvage failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_SALVAGE_FAIL		1178
+#define	WT_STAT_CONN_SESSION_TABLE_SALVAGE_FAIL		1177
 /*! session: table salvage successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_SALVAGE_SUCCESS	1179
+#define	WT_STAT_CONN_SESSION_TABLE_SALVAGE_SUCCESS	1178
 /*! session: table truncate failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_TRUNCATE_FAIL	1180
+#define	WT_STAT_CONN_SESSION_TABLE_TRUNCATE_FAIL	1179
 /*! session: table truncate successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_TRUNCATE_SUCCESS	1181
+#define	WT_STAT_CONN_SESSION_TABLE_TRUNCATE_SUCCESS	1180
 /*! session: table verify failed calls */
-#define	WT_STAT_CONN_SESSION_TABLE_VERIFY_FAIL		1182
+#define	WT_STAT_CONN_SESSION_TABLE_VERIFY_FAIL		1181
 /*! session: table verify successful calls */
-#define	WT_STAT_CONN_SESSION_TABLE_VERIFY_SUCCESS	1183
+#define	WT_STAT_CONN_SESSION_TABLE_VERIFY_SUCCESS	1182
 /*! thread-state: active filesystem fsync calls */
-#define	WT_STAT_CONN_THREAD_FSYNC_ACTIVE		1184
+#define	WT_STAT_CONN_THREAD_FSYNC_ACTIVE		1183
 /*! thread-state: active filesystem read calls */
-#define	WT_STAT_CONN_THREAD_READ_ACTIVE			1185
+#define	WT_STAT_CONN_THREAD_READ_ACTIVE			1184
 /*! thread-state: active filesystem write calls */
-#define	WT_STAT_CONN_THREAD_WRITE_ACTIVE		1186
+#define	WT_STAT_CONN_THREAD_WRITE_ACTIVE		1185
 /*! thread-yield: page acquire busy blocked */
-#define	WT_STAT_CONN_PAGE_BUSY_BLOCKED			1187
+#define	WT_STAT_CONN_PAGE_BUSY_BLOCKED			1186
 /*! thread-yield: page acquire eviction blocked */
-#define	WT_STAT_CONN_PAGE_FORCIBLE_EVICT_BLOCKED	1188
+#define	WT_STAT_CONN_PAGE_FORCIBLE_EVICT_BLOCKED	1187
 /*! thread-yield: page acquire locked blocked */
-#define	WT_STAT_CONN_PAGE_LOCKED_BLOCKED		1189
+#define	WT_STAT_CONN_PAGE_LOCKED_BLOCKED		1188
 /*! thread-yield: page acquire read blocked */
-#define	WT_STAT_CONN_PAGE_READ_BLOCKED			1190
+#define	WT_STAT_CONN_PAGE_READ_BLOCKED			1189
 /*! thread-yield: page acquire time sleeping (usecs) */
-#define	WT_STAT_CONN_PAGE_SLEEP				1191
+#define	WT_STAT_CONN_PAGE_SLEEP				1190
 /*! transaction: number of named snapshots created */
-#define	WT_STAT_CONN_TXN_SNAPSHOTS_CREATED		1192
+#define	WT_STAT_CONN_TXN_SNAPSHOTS_CREATED		1191
 /*! transaction: number of named snapshots dropped */
-#define	WT_STAT_CONN_TXN_SNAPSHOTS_DROPPED		1193
+#define	WT_STAT_CONN_TXN_SNAPSHOTS_DROPPED		1192
 /*! transaction: transaction begins */
-#define	WT_STAT_CONN_TXN_BEGIN				1194
+#define	WT_STAT_CONN_TXN_BEGIN				1193
 /*! transaction: transaction checkpoint currently running */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_RUNNING		1195
+#define	WT_STAT_CONN_TXN_CHECKPOINT_RUNNING		1194
 /*! transaction: transaction checkpoint generation */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_GENERATION		1196
+#define	WT_STAT_CONN_TXN_CHECKPOINT_GENERATION		1195
 /*! transaction: transaction checkpoint max time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX		1197
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX		1196
 /*! transaction: transaction checkpoint min time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN		1198
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN		1197
 /*! transaction: transaction checkpoint most recent time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT		1199
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT		1198
 /*! transaction: transaction checkpoint scrub dirty target */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET	1200
+#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET	1199
 /*! transaction: transaction checkpoint scrub time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME		1201
+#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME		1200
 /*! transaction: transaction checkpoint total time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL		1202
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL		1201
 /*! transaction: transaction checkpoints */
-#define	WT_STAT_CONN_TXN_CHECKPOINT			1203
+#define	WT_STAT_CONN_TXN_CHECKPOINT			1202
 /*! transaction: transaction failures due to cache overflow */
-#define	WT_STAT_CONN_TXN_FAIL_CACHE			1204
+#define	WT_STAT_CONN_TXN_FAIL_CACHE			1203
 /*!
  * transaction: transaction fsync calls for checkpoint after allocating
  * the transaction ID
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST		1205
+#define	WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST		1204
 /*!
  * transaction: transaction fsync duration for checkpoint after
  * allocating the transaction ID (usecs)
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST_DURATION	1206
+#define	WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST_DURATION	1205
 /*! transaction: transaction range of IDs currently pinned */
-#define	WT_STAT_CONN_TXN_PINNED_RANGE			1207
+#define	WT_STAT_CONN_TXN_PINNED_RANGE			1206
 /*! transaction: transaction range of IDs currently pinned by a checkpoint */
-#define	WT_STAT_CONN_TXN_PINNED_CHECKPOINT_RANGE	1208
+#define	WT_STAT_CONN_TXN_PINNED_CHECKPOINT_RANGE	1207
 /*!
  * transaction: transaction range of IDs currently pinned by named
  * snapshots
  */
-#define	WT_STAT_CONN_TXN_PINNED_SNAPSHOT_RANGE		1209
+#define	WT_STAT_CONN_TXN_PINNED_SNAPSHOT_RANGE		1208
 /*! transaction: transaction sync calls */
-#define	WT_STAT_CONN_TXN_SYNC				1210
+#define	WT_STAT_CONN_TXN_SYNC				1209
 /*! transaction: transactions committed */
-#define	WT_STAT_CONN_TXN_COMMIT				1211
+#define	WT_STAT_CONN_TXN_COMMIT				1210
 /*! transaction: transactions rolled back */
-#define	WT_STAT_CONN_TXN_ROLLBACK			1212
+#define	WT_STAT_CONN_TXN_ROLLBACK			1211
 
 /*!
  * @}
diff --git a/src/support/stat.c b/src/support/stat.c
index 8927be862c1..81859ef1ca8 100644
--- a/src/support/stat.c
+++ b/src/support/stat.c
@@ -562,7 +562,6 @@ static const char * const __stats_connection_desc[] = {
 	"cache: eviction server candidate queue empty when topping up",
 	"cache: eviction server candidate queue not empty when topping up",
 	"cache: eviction server evicting pages",
-	"cache: eviction server skipped very large page",
 	"cache: eviction server slept, because we did not make progress with eviction",
 	"cache: eviction server unable to reach eviction goal",
 	"cache: eviction state",
@@ -805,7 +804,6 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
 	stats->cache_eviction_queue_empty = 0;
 	stats->cache_eviction_queue_not_empty = 0;
 	stats->cache_eviction_server_evicting = 0;
-	stats->cache_eviction_server_toobig = 0;
 	stats->cache_eviction_server_slept = 0;
 	stats->cache_eviction_slow = 0;
 		/* not clearing cache_eviction_state */
@@ -1049,8 +1047,6 @@ __wt_stat_connection_aggregate(
 	    WT_STAT_READ(from, cache_eviction_queue_not_empty);
 	to->cache_eviction_server_evicting +=
 	    WT_STAT_READ(from, cache_eviction_server_evicting);
-	to->cache_eviction_server_toobig +=
-	    WT_STAT_READ(from, cache_eviction_server_toobig);
 	to->cache_eviction_server_slept +=
 	    WT_STAT_READ(from, cache_eviction_server_slept);
 	to->cache_eviction_slow += WT_STAT_READ(from, cache_eviction_slow);
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c
index 97a9fce24c6..91cee92b862 100644
--- a/src/txn/txn_ckpt.c
+++ b/src/txn/txn_ckpt.c
@@ -329,6 +329,11 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
 	conn = S2C(session);
 	cache = conn->cache;
 
+	/* Give up if scrubbing is disabled. */
+	if (cache->eviction_checkpoint_target == 0 ||
+	    cache->eviction_checkpoint_target >= cache->eviction_dirty_trigger)
+		return (0);
+
 	WT_RET(__wt_epoch(session, &start));
 	last = start;
 	bytes_written_last = 0;
@@ -352,7 +357,7 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
 	 * Start with the scrub target equal to the expected maximum percentage
 	 * of dirty data in cache.
 	 */
-	cache->eviction_scrub_target = cache->eviction_dirty_trigger;
+	cache->eviction_scrub_limit = cache->eviction_dirty_trigger;
 
 	/* Stop if we write as much dirty data as is currently in cache. */
 	max_write = __wt_cache_dirty_leaf_inuse(cache);
@@ -361,7 +366,8 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
 	for (;;) {
 		current_dirty =
 		    (100.0 * __wt_cache_dirty_leaf_inuse(cache)) / cache_size;
-		if (current_dirty <= (double)cache->eviction_dirty_target)
+		if (current_dirty <=
+		    (double)cache->eviction_checkpoint_target)
 			break;
 
 		__wt_sleep(0, stepdown_us / 10);
@@ -371,7 +377,7 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
 		bytes_written_total =
 		    cache->bytes_written - bytes_written_start;
 
-		if (current_dirty > cache->eviction_scrub_target) {
+		if (current_dirty > cache->eviction_scrub_limit) {
 			/*
 			 * We haven't reached the current target.
 			 *
@@ -417,9 +423,9 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
 		 * level.
 		 */
 		__wt_sleep(0, 10 * stepdown_us);
-		cache->eviction_scrub_target = current_dirty - delta;
+		cache->eviction_scrub_limit = current_dirty - delta;
 		WT_STAT_FAST_CONN_SET(session, txn_checkpoint_scrub_target,
-		    cache->eviction_scrub_target);
+		    cache->eviction_scrub_limit);
 		WT_RET(__wt_epoch(session, &last));
 	}
 
@@ -698,7 +704,7 @@ __txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[])
 	 * Unblock updates -- we can figure out that any updates to clean pages
 	 * after this point are too new to be written in the checkpoint.
 	 */
-	cache->eviction_scrub_target = 0.0;
+	cache->eviction_scrub_limit = 0.0;
 	WT_STAT_FAST_CONN_SET(session, txn_checkpoint_scrub_target, 0);
 
 	/*
@@ -822,7 +828,7 @@ err:	/*
 	if (tracking)
 		WT_TRET(__wt_meta_track_off(session, false, ret != 0));
 
-	cache->eviction_scrub_target = 0.0;
+	cache->eviction_scrub_limit = 0.0;
 	WT_STAT_FAST_CONN_SET(session, txn_checkpoint_scrub_target, 0);
 
 	if (F_ISSET(txn, WT_TXN_RUNNING)) {