From 439c154020869f0ed08094f3aeb01920312ec31a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 28 Feb 2015 13:29:19 +0000
Subject: [PATCH] Configurable bundle cache size

git-svn-id: https://svn.argeo.org/commons/trunk@7991 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/argeo_node_rap.properties                                | 4 +++-
 .../src/org/argeo/cms/internal/kernel/JackrabbitNode.java     | 4 +++-
 .../src/org/argeo/cms/internal/kernel/KernelConstants.java    | 1 +
 .../src/org/argeo/cms/internal/kernel/repository-h2.xml       | 2 ++
 .../src/org/argeo/cms/internal/kernel/repository-memory.xml   | 2 ++
 .../org/argeo/cms/internal/kernel/repository-postgresql.xml   | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/demo/argeo_node_rap.properties b/demo/argeo_node_rap.properties
index 4361bfc9c..502c50e8c 100644
--- a/demo/argeo_node_rap.properties
+++ b/demo/argeo_node_rap.properties
@@ -34,7 +34,9 @@ eclipse.registry.MultiLanguage=true
 log4j.configuration=file:../../log4j.properties
 
 # Tuning
-#argeo.node.repo.maxCacheMB=64
+#argeo.node.repo.maxCacheMB=16
+#argeo.node.repo.bundleCacheMB=8
+#argeo.node.repo.maxPoolSize=10
 
 # DON'T CHANGE BELOW
 org.eclipse.rap.workbenchAutostart=false
\ No newline at end of file
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java
index 918d06f96..5e8669e4b 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java
@@ -119,6 +119,8 @@ class JackrabbitNode extends JackrabbitWrapper implements KernelConstants,
 		// common
 		setProp(defaults, REPO_DEFAULT_WORKSPACE, "main");
 		setProp(defaults, REPO_MAX_POOL_SIZE, "10");
+		// Jackrabbit default:
+		setProp(defaults, REPO_BUNDLE_CACHE_MB, "8");
 
 		// specific
 		String dburl;
@@ -162,7 +164,7 @@ class JackrabbitNode extends JackrabbitWrapper implements KernelConstants,
 		RepositoryImpl repository = repositoryContext.getRepository();
 
 		// cache
-		String maxCacheMbStr = prop(KernelConstants.REPO_MAX_CACHE_MB, null);
+		String maxCacheMbStr = prop(REPO_MAX_CACHE_MB, null);
 		if (maxCacheMbStr != null) {
 			Integer maxCacheMB = Integer.parseInt(maxCacheMbStr);
 			CacheManager cacheManager = repository.getCacheManager();
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
index 6d73e1188..896eca5b8 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
@@ -11,6 +11,7 @@ public interface KernelConstants {
 	final static String REPO_DBPASSWORD = "argeo.node.repo.dbpassword";
 	final static String REPO_MAX_POOL_SIZE = "argeo.node.repo.maxPoolSize";
 	final static String REPO_MAX_CACHE_MB = "argeo.node.repo.maxCacheMB";
+	final static String REPO_BUNDLE_CACHE_MB = "argeo.node.repo.bundleCacheMB";
 
 	final static String[] DEFAULT_CNDS = { "/org/argeo/jcr/argeo.cnd",
 			"/org/argeo/cms/cms.cnd" };
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml
index 68168a852..5f7d0043d 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml
@@ -36,6 +36,7 @@
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}"/>
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${wsp.home}/index" />
@@ -54,6 +55,7 @@
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}"/>
 		</PersistenceManager>
 	</Versioning>
 
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-memory.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-memory.xml
index aeb22692c..8181ad34d 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-memory.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-memory.xml
@@ -12,6 +12,7 @@
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
 			<param name="blobFSBlockSize" value="1" />
+			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}"/>
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${wsp.home}/index" />
@@ -27,6 +28,7 @@
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
 			<param name="blobFSBlockSize" value="1" />
+			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}"/>
 		</PersistenceManager>
 	</Versioning>
 
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml
index 01c9474ca..6ed23b59a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml
@@ -36,6 +36,7 @@
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}"/>
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${wsp.home}/index" />
@@ -53,6 +54,7 @@
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}"/>
 		</PersistenceManager>
 	</Versioning>
 
-- 
2.30.2