Author: mreutegg
Date: Tue Nov 29 10:08:32 2016
New Revision: 1771875
URL: http://svn.apache.org/viewvc?rev=1771875&view=rev
Log:
OAK-5166: Change default cache distribution
Update documentation
Modified:
jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/documentmk.md
jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/persistent-cache.md
jackrabbit/oak/trunk/oak-doc/src/site/markdown/osgi_config.md
Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/documentmk.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/documentmk.md?rev=1771875&r1=1771874&r2=1771875&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/documentmk.md
(original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/documentmk.md Tue
Nov 29 10:08:32 2016
@@ -539,12 +539,12 @@ In a default setup the [DocumentNodeStor
takes a single config for `cache` which is internally distributed among the
various caches above in following way
-1. `nodeCache` - 25%
-2. `prevDocCache` - 4%
-3. `childrenCache` - 10%
-4. `docChildrenCache` - 3% (removed in 1.5.6)
-5. `diffCache` - 5%
-6. `documentCache` - Is given the rest i.e. 57%
+1. `nodeCache` - 35% (was 25% until 1.5.14)
+2. `prevDocCache` - 4%
+3. `childrenCache` - 15% (was 10% until 1.5.14)
+4. `diffCache` - 30% (was 4% until 1.5.14)
+5. `documentCache` - Is given the rest i.e. 16%
+6. `docChildrenCache` - 0% (removed in 1.5.6, default was 3%)
Lately [options are provided][OAK-2546] to have a fine grained control over
the
distribution. See [Cache Allocation][cache-allocation]
Modified:
jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/persistent-cache.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/persistent-cache.md?rev=1771875&r1=1771874&r2=1771875&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/persistent-cache.md
(original)
+++
jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/persistent-cache.md
Tue Nov 29 10:08:32 2016
@@ -30,14 +30,14 @@ the load on the storage backend.
The default OSGi configuration of the persistent cache is:
org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService
- persistentCache=cache,binary=0
+ persistentCache="cache,binary\=0"
### Configuration Options
The persistent cache configuration setting is string with a number of comma
separated elements.
The first element is the directory where the cache is stored. Example:
- cache
+ "cache"
In this case, the data is stored in the directory "cache",
relative to the `repository.home` directory. If no repository home directory is
@@ -83,12 +83,12 @@ To disable this option, use "-compress".
Those setting can be appended to the persistent cache configuration string.
An example configuration is:
- cache,size=2048,binary=0,-compact,-compress
+ "cache,size\=2048,binary\=0,-compact,-compress"
To disable the persistent cache entirely, use the following configuration:
org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService
- persistentCache=-
+ persistentCache="-"
### Journal cache
@@ -99,13 +99,13 @@ configured independently if needed. This
configuration like in the following example:
org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService
- persistentCache=cache,size=2048
- journalCache=diff-cache,size=1024
+ persistentCache="cache,size\=2048"
+ journalCache="diff-cache,size\=1024"
The configuration options are the same as for the `persistentCache`, but
options
unrelated to the diff cache type are ignored. The default configuration is
-`journalCache=diff-cache` and can be disabled the same way as the
-regular persistent cache with a dash: `journalCache=-`.
+`journalCache="diff-cache"` and can be disabled the same way as the
+regular persistent cache with a dash: `journalCache="-"`.
###Â Dependencies
Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/osgi_config.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/osgi_config.md?rev=1771875&r1=1771874&r2=1771875&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/osgi_config.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/osgi_config.md Tue Nov 29
10:08:32 2016
@@ -273,7 +273,7 @@ persistentCache
<a name="cache-allocation"></a>
nodeCachePercentage
-: Default 25
+: Default 35 (was 25 until 1.5.14)
: Percentage of `cache` allocated for `nodeCache`. See [Caching][doc-cache]
prevDocCachePercentage
@@ -282,11 +282,11 @@ prevDocCachePercentage
: Since 1.3.15
childrenCachePercentage
-: Default 10
+: Default 15 (was 10 until 1.5.14)
: Percentage of `cache` allocated for `childrenCache`. See [Caching][doc-cache]
diffCachePercentage
-: Default 5
+: Default 30 (was 5 until 1.5.14)
: Percentage of `cache` allocated for `diffCache`. See [Caching][doc-cache]
docChildrenCachePercentage
