Merge branch 'develop' into mongodb-3.4

3 files changed, 8 insertions, 8 deletions

diff --git a/dist/api_data.py b/dist/api_data.py
index 0f4506f608c..44fc935d5d3 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -402,7 +402,7 @@ connection_runtime_config = [
                 vary depending on the current eviction load''',
                 min=1, max=20),
             ]),
-    Config('eviction_checkpoint_target', '5', r'''
+    Config('eviction_checkpoint_target', '15', 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''',
diff --git a/src/config/config_def.c b/src/config/config_def.c
index 0ff2fd379d2..f231d7fc5d9 100644
--- a/src/config/config_def.c
+++ b/src/config/config_def.c
@@ -1005,7 +1005,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  "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_checkpoint_target=5,eviction_dirty_target=5,"
+	  "eviction_checkpoint_target=15,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,"
@@ -1207,7 +1207,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  "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_checkpoint_target=5,eviction_dirty_target=5,"
+	  "eviction_checkpoint_target=15,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,"
@@ -1230,7 +1230,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  "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_checkpoint_target=5,eviction_dirty_target=5,"
+	  "eviction_checkpoint_target=15,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,"
@@ -1252,7 +1252,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",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_checkpoint_target=5,"
+	  "threads_min=1),eviction_checkpoint_target=15,"
 	  "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,"
@@ -1273,7 +1273,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  ",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_checkpoint_target=5,"
+	  "threads_min=1),eviction_checkpoint_target=15,"
 	  "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,"
diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in
index d4d52545bfc..61a66bd4086 100644
--- a/src/include/wiredtiger.in
+++ b/src/include/wiredtiger.in
@@ -1812,7 +1812,7 @@ struct __wt_connection {
 	 * 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.}
+	 * default \c 15.}
 	 * @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
@@ -2278,7 +2278,7 @@ struct __wt_connection {
  * @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.}
+ * is \c true., an integer between 0 and 99; default \c 15.}
  * @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