From a284415e775bf4e55a49b8d1e230c541dfdffbc8 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 23 Jul 2014 12:57:25 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 77031: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 71682: ACE-1745: reduced fully-distributed cache sizes, since limits are now per node not per cluster. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/caches.properties | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/config/alfresco/caches.properties b/config/alfresco/caches.properties index 1c36f418a3..0f30f4d465 100644 --- a/config/alfresco/caches.properties +++ b/config/alfresco/caches.properties @@ -69,7 +69,7 @@ cache.propertyClassCache.eviction-percentage=25 cache.propertyClassCache.merge-policy=hz.ADD_NEW_ENTRY cache.contentDataSharedCache.tx.maxItems=65000 -cache.contentDataSharedCache.maxItems=130000 +cache.contentDataSharedCache.maxItems=32500 cache.contentDataSharedCache.timeToLiveSeconds=0 cache.contentDataSharedCache.maxIdleSeconds=0 cache.contentDataSharedCache.cluster.type=fully-distributed @@ -138,7 +138,7 @@ cache.node.propertiesSharedCache.eviction-policy=LRU cache.node.propertiesSharedCache.eviction-percentage=25 cache.node.propertiesSharedCache.merge-policy=hz.ADD_NEW_ENTRY -cache.node.parentAssocsSharedCache.maxItems=130000 +cache.node.parentAssocsSharedCache.maxItems=32500 cache.node.parentAssocsSharedCache.timeToLiveSeconds=0 cache.node.parentAssocsSharedCache.maxIdleSeconds=0 cache.node.parentAssocsSharedCache.cluster.type=fully-distributed @@ -168,7 +168,7 @@ cache.userToAuthoritySharedCache.eviction-percentage=25 cache.userToAuthoritySharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.authenticationSharedCache.tx.maxItems=100 -cache.authenticationSharedCache.maxItems=5000 +cache.authenticationSharedCache.maxItems=1250 cache.authenticationSharedCache.timeToLiveSeconds=0 cache.authenticationSharedCache.maxIdleSeconds=0 cache.authenticationSharedCache.cluster.type=fully-distributed @@ -208,7 +208,7 @@ cache.zoneToAuthoritySharedCache.eviction-percentage=25 cache.zoneToAuthoritySharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.permissionsAccessSharedCache.tx.maxItems=10000 -cache.permissionsAccessSharedCache.maxItems=50000 +cache.permissionsAccessSharedCache.maxItems=12500 cache.permissionsAccessSharedCache.timeToLiveSeconds=0 cache.permissionsAccessSharedCache.maxIdleSeconds=0 cache.permissionsAccessSharedCache.cluster.type=fully-distributed @@ -218,7 +218,7 @@ cache.permissionsAccessSharedCache.eviction-percentage=25 cache.permissionsAccessSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.readersSharedCache.tx.maxItems=10000 -cache.readersSharedCache.maxItems=10000 +cache.readersSharedCache.maxItems=2500 cache.readersSharedCache.timeToLiveSeconds=0 cache.readersSharedCache.maxIdleSeconds=0 cache.readersSharedCache.cluster.type=fully-distributed @@ -228,7 +228,7 @@ cache.readersSharedCache.eviction-percentage=25 cache.readersSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.readersDeniedSharedCache.tx.maxItems=10000 -cache.readersDeniedSharedCache.maxItems=10000 +cache.readersDeniedSharedCache.maxItems=2500 cache.readersDeniedSharedCache.timeToLiveSeconds=0 cache.readersDeniedSharedCache.maxIdleSeconds=0 cache.readersDeniedSharedCache.cluster.type=fully-distributed @@ -238,7 +238,7 @@ cache.readersDeniedSharedCache.eviction-percentage=25 cache.readersDeniedSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.nodeOwnerSharedCache.tx.maxItems=40000 -cache.nodeOwnerSharedCache.maxItems=40000 +cache.nodeOwnerSharedCache.maxItems=10000 cache.nodeOwnerSharedCache.timeToLiveSeconds=0 cache.nodeOwnerSharedCache.maxIdleSeconds=0 cache.nodeOwnerSharedCache.cluster.type=fully-distributed @@ -250,7 +250,7 @@ cache.nodeOwnerSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.nodeRulesSharedCache.tx.maxItems=2000 cache.personSharedCache.tx.maxItems=1000 -cache.personSharedCache.maxItems=1000 +cache.personSharedCache.maxItems=250 cache.personSharedCache.timeToLiveSeconds=0 cache.personSharedCache.maxIdleSeconds=0 cache.personSharedCache.cluster.type=fully-distributed @@ -259,7 +259,7 @@ cache.personSharedCache.eviction-policy=LRU cache.personSharedCache.eviction-percentage=25 cache.personSharedCache.merge-policy=hz.ADD_NEW_ENTRY -cache.ticketsCache.maxItems=1000 +cache.ticketsCache.maxItems=250 cache.ticketsCache.timeToLiveSeconds=0 cache.ticketsCache.maxIdleSeconds=0 cache.ticketsCache.cluster.type=fully-distributed @@ -269,7 +269,7 @@ cache.ticketsCache.eviction-percentage=25 cache.ticketsCache.merge-policy=hz.ADD_NEW_ENTRY cache.avmEntitySharedCache.tx.maxItems=5000 -cache.avmEntitySharedCache.maxItems=5000 +cache.avmEntitySharedCache.maxItems=1250 cache.avmEntitySharedCache.timeToLiveSeconds=0 cache.avmEntitySharedCache.maxIdleSeconds=0 cache.avmEntitySharedCache.cluster.type=fully-distributed @@ -278,7 +278,7 @@ cache.avmEntitySharedCache.eviction-policy=LRU cache.avmEntitySharedCache.eviction-percentage=25 cache.avmEntitySharedCache.merge-policy=hz.ADD_NEW_ENTRY -cache.avmVersionRootEntitySharedCache.maxItems=1000 +cache.avmVersionRootEntitySharedCache.maxItems=250 cache.avmVersionRootEntitySharedCache.timeToLiveSeconds=0 cache.avmVersionRootEntitySharedCache.maxIdleSeconds=0 cache.avmVersionRootEntitySharedCache.cluster.type=fully-distributed @@ -288,7 +288,7 @@ cache.avmVersionRootEntitySharedCache.eviction-percentage=25 cache.avmVersionRootEntitySharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.avmNodeSharedCache.tx.maxItems=5000 -cache.avmNodeSharedCache.maxItems=5000 +cache.avmNodeSharedCache.maxItems=1250 cache.avmNodeSharedCache.timeToLiveSeconds=0 cache.avmNodeSharedCache.maxIdleSeconds=0 cache.avmNodeSharedCache.cluster.type=fully-distributed @@ -298,7 +298,7 @@ cache.avmNodeSharedCache.eviction-percentage=25 cache.avmNodeSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.avmNodeAspectsSharedCache.tx.maxItems=5000 -cache.avmNodeAspectsSharedCache.maxItems=5000 +cache.avmNodeAspectsSharedCache.maxItems=1250 cache.avmNodeAspectsSharedCache.timeToLiveSeconds=0 cache.avmNodeAspectsSharedCache.maxIdleSeconds=0 cache.avmNodeAspectsSharedCache.cluster.type=fully-distributed @@ -314,7 +314,7 @@ cache.avmVersionRootEntityCache.tx.maxItems=100 cache.authorityEntitySharedCache.tx.maxItems=50000 cache.webServicesQuerySessionSharedCache.tx.maxItems=50 -cache.webServicesQuerySessionSharedCache.maxItems=1000 +cache.webServicesQuerySessionSharedCache.maxItems=250 cache.webServicesQuerySessionSharedCache.timeToLiveSeconds=0 cache.webServicesQuerySessionSharedCache.maxIdleSeconds=0 cache.webServicesQuerySessionSharedCache.cluster.type=fully-distributed @@ -324,7 +324,7 @@ cache.webServicesQuerySessionSharedCache.eviction-percentage=25 cache.webServicesQuerySessionSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.aclSharedCache.tx.maxItems=20000 -cache.aclSharedCache.maxItems=50000 +cache.aclSharedCache.maxItems=12500 cache.aclSharedCache.timeToLiveSeconds=0 cache.aclSharedCache.maxIdleSeconds=0 cache.aclSharedCache.cluster.type=fully-distributed @@ -334,7 +334,7 @@ cache.aclSharedCache.eviction-percentage=25 cache.aclSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.aclEntitySharedCache.tx.maxItems=50000 -cache.aclEntitySharedCache.maxItems=50000 +cache.aclEntitySharedCache.maxItems=12500 cache.aclEntitySharedCache.timeToLiveSeconds=0 cache.aclEntitySharedCache.maxIdleSeconds=0 cache.aclEntitySharedCache.cluster.type=fully-distributed @@ -344,7 +344,7 @@ cache.aclEntitySharedCache.eviction-percentage=25 cache.aclEntitySharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.resourceBundleBaseNamesSharedCache.tx.maxItems=1000 -cache.resourceBundleBaseNamesSharedCache.maxItems=1000 +cache.resourceBundleBaseNamesSharedCache.maxItems=250 cache.resourceBundleBaseNamesSharedCache.timeToLiveSeconds=0 cache.resourceBundleBaseNamesSharedCache.maxIdleSeconds=0 cache.resourceBundleBaseNamesSharedCache.cluster.type=invalidating @@ -354,7 +354,7 @@ cache.resourceBundleBaseNamesSharedCache.eviction-percentage=25 cache.resourceBundleBaseNamesSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.loadedResourceBundlesSharedCache.tx.maxItems=1000 -cache.loadedResourceBundlesSharedCache.maxItems=1000 +cache.loadedResourceBundlesSharedCache.maxItems=250 cache.loadedResourceBundlesSharedCache.timeToLiveSeconds=0 cache.loadedResourceBundlesSharedCache.maxIdleSeconds=0 cache.loadedResourceBundlesSharedCache.cluster.type=invalidating @@ -364,7 +364,7 @@ cache.loadedResourceBundlesSharedCache.eviction-percentage=25 cache.loadedResourceBundlesSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.messagesSharedCache.tx.maxItems=1000 -cache.messagesSharedCache.maxItems=1000 +cache.messagesSharedCache.maxItems=250 cache.messagesSharedCache.timeToLiveSeconds=0 cache.messagesSharedCache.maxIdleSeconds=0 cache.messagesSharedCache.cluster.type=invalidating @@ -401,7 +401,7 @@ cache.routingContentStoreSharedCache.eviction-policy=LRU cache.routingContentStoreSharedCache.eviction-percentage=25 cache.routingContentStoreSharedCache.merge-policy=hz.ADD_NEW_ENTRY -cache.executingActionsCache.maxItems=1000 +cache.executingActionsCache.maxItems=250 cache.executingActionsCache.timeToLiveSeconds=0 cache.executingActionsCache.maxIdleSeconds=0 cache.executingActionsCache.cluster.type=fully-distributed @@ -411,7 +411,7 @@ cache.executingActionsCache.eviction-percentage=25 cache.executingActionsCache.merge-policy=hz.ADD_NEW_ENTRY cache.tagscopeSummarySharedCache.tx.maxItems=1000 -cache.tagscopeSummarySharedCache.maxItems=1000 +cache.tagscopeSummarySharedCache.maxItems=250 cache.tagscopeSummarySharedCache.timeToLiveSeconds=0 cache.tagscopeSummarySharedCache.maxIdleSeconds=0 cache.tagscopeSummarySharedCache.cluster.type=fully-distributed @@ -431,7 +431,7 @@ cache.imapMessageSharedCache.eviction-percentage=25 cache.imapMessageSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.tenantEntitySharedCache.tx.maxItems=1000 -cache.tenantEntitySharedCache.maxItems=1000 +cache.tenantEntitySharedCache.maxItems=250 cache.tenantEntitySharedCache.timeToLiveSeconds=0 cache.tenantEntitySharedCache.maxIdleSeconds=0 cache.tenantEntitySharedCache.cluster.type=fully-distributed @@ -450,7 +450,7 @@ cache.immutableSingletonSharedCache.eviction-policy=LRU cache.immutableSingletonSharedCache.eviction-percentage=25 cache.immutableSingletonSharedCache.merge-policy=hz.ADD_NEW_ENTRY -cache.remoteAlfrescoTicketService.ticketsCache.maxItems=1000 +cache.remoteAlfrescoTicketService.ticketsCache.maxItems=250 cache.remoteAlfrescoTicketService.ticketsCache.timeToLiveSeconds=0 cache.remoteAlfrescoTicketService.ticketsCache.maxIdleSeconds=0 cache.remoteAlfrescoTicketService.ticketsCache.cluster.type=fully-distributed @@ -490,7 +490,7 @@ cache.propertyUniqueContextSharedCache.eviction-percentage=25 cache.propertyUniqueContextSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.siteNodeRefSharedCache.tx.maxItems=5000 -cache.siteNodeRefSharedCache.maxItems=5000 +cache.siteNodeRefSharedCache.maxItems=1250 cache.siteNodeRefSharedCache.timeToLiveSeconds=0 cache.siteNodeRefSharedCache.maxIdleSeconds=0 cache.siteNodeRefSharedCache.cluster.type=fully-distributed @@ -529,7 +529,7 @@ cache.publicapi.webScriptsRegistryCache.eviction-percentage=25 cache.publicapi.webScriptsRegistryCache.merge-policy=hz.ADD_NEW_ENTRY cache.deletePseudoFileCache.tx.maxItems=50000 -cache.deletePseudoFileCache.maxItems=50000 +cache.deletePseudoFileCache.maxItems=12500 cache.deletePseudoFileCache.timeToLiveSeconds=180 cache.deletePseudoFileCache.maxIdleSeconds=0 cache.deletePseudoFileCache.cluster.type=fully-distributed