diff options
author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-08-13 15:01:26 +1000 |
---|---|---|
committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-08-13 15:01:26 +1000 |
commit | 9c63e700a5d54888cc838557aaabdd99c0681d85 (patch) | |
tree | c72db6e33f3f5e94d418745fca1b16ec9dbec7a1 | |
parent | 15e64901c45a4e12baeae8f2177b51cd8d8d2189 (diff) | |
download | mongo-9c63e700a5d54888cc838557aaabdd99c0681d85.tar.gz |
Revert the default behavior for eviction worker threads back to having just the main eviction thread.
refs #1158
-rw-r--r-- | dist/api_data.py | 8 | ||||
-rw-r--r-- | src/config/config_def.c | 4 | ||||
-rw-r--r-- | src/docs/upgrading.dox | 10 | ||||
-rw-r--r-- | src/include/wiredtiger.in | 16 |
4 files changed, 18 insertions, 20 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index 45b2655d8f0..0c3666e1af6 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -343,10 +343,10 @@ connection_runtime_config = [ Config('eviction', '', r''' eviction configuration options.''', type='category', subconfig=[ - Config('threads_max', '3', r''' - maximum number of threads WiredTiger will start to help - evict pages from cache. The number of threads currently running - will vary depending on the current eviction load''', + Config('threads_max', '1', r''' + maximum number of threads WiredTiger will start to help evict + pages from cache. The number of threads started will vary + depending on the current eviction load''', min=1, max=20), Config('threads_min', '1', r''' minimum number of threads WiredTiger will start to help evict diff --git a/src/config/config_def.c b/src/config/config_def.c index 52b4199ee0a..8434d049bd3 100644 --- a/src/config/config_def.c +++ b/src/config/config_def.c @@ -376,7 +376,7 @@ static const WT_CONFIG_ENTRY config_entries[] = { { "connection.reconfigure", "async=(enabled=0,ops_max=1024,threads=2),cache_size=100MB," "checkpoint=(name=\"WiredTigerCheckpoint\",wait=0),error_prefix=," - "eviction=(threads_max=3,threads_min=1),eviction_dirty_target=80," + "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=80," "eviction_target=80,eviction_trigger=95,shared_cache=(chunk=10MB," "name=,reserve=0,size=500MB),statistics=none," "statistics_log=(on_close=0,path=\"WiredTigerStat.%d.%H\"," @@ -486,7 +486,7 @@ static const WT_CONFIG_ENTRY config_entries[] = { "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," "cache_size=100MB,checkpoint=(name=\"WiredTigerCheckpoint\"," "wait=0),checkpoint_sync=,create=0,direct_io=,error_prefix=," - "eviction=(threads_max=3,threads_min=1),eviction_dirty_target=80," + "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=80," "eviction_target=80,eviction_trigger=95,exclusive=0,extensions=," "file_extend=,hazard_max=1000,log=(archive=,enabled=0," "file_max=100MB,path=\"\"),lsm_merge=,mmap=,multiprocess=0," diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox index eaecc3e6b42..16ff74103db 100644 --- a/src/docs/upgrading.dox +++ b/src/docs/upgrading.dox @@ -6,13 +6,11 @@ <dt>::wiredtiger_open eviction_workers configuration changed</dt> <dd> The \c eviction_workers configuration setting has been replaced by -\c eviction=(threads_min) and \c eviction=(threads_max) settings. To -replicate the old default behavior set -<code>eviction=(threads_min=1,threads_max=1)</code>. +\c eviction=(threads_min) and \c eviction=(threads_max) settings. -There is also a semantic change \c eviction_workers used to configure -additional threads whereas the new settings configure the total number -of threads involved with eviction. +There is also a semantic change because \c eviction_workers used to +configure additional threads whereas the new settings configure the total +number of threads involved with eviction. </dd> </dl> diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index d5da1249457..214133a1326 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -1522,8 +1522,8 @@ struct __wt_connection { * related configuration options defined below.} * @config{ threads_max, maximum number of * threads WiredTiger will start to help evict pages from cache. The - * number of threads currently running will vary depending on the - * current eviction load., an integer between 1 and 20; default \c 3.} + * number of threads started will vary depending on the current eviction + * load., an integer between 1 and 20; default \c 1.} * @config{ threads_min, minimum number of * threads WiredTiger will start to help evict pages from cache. The * number of threads currently running will vary depending on the @@ -1846,12 +1846,12 @@ struct __wt_connection { * configuration options defined below.} * @config{ threads_max, maximum number of threads * WiredTiger will start to help evict pages from cache. The number of threads - * currently running will vary depending on the current eviction load., an - * integer between 1 and 20; default \c 3.} - * @config{ threads_min, minimum number of threads - * WiredTiger will start to help evict pages from cache. The number of threads - * currently running will vary depending on the current eviction load., an - * integer between 1 and 20; default \c 1.} + * started will vary depending on the current eviction load., an integer between + * 1 and 20; default \c 1.} + * @config{ threads_min, minimum + * number of threads WiredTiger will start to help evict pages from cache. The + * 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_dirty_target, continue evicting until the cache has less * dirty memory than the value\, as a percentage of the total cache size. Dirty |